i2c: pnx: move header into the driver

There are no platform_data users anymore. Move the structs into the
driver.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>

diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index a542041df0cd4c95ff8e25340a9c36742eedba8f..6e0e546ef83fcabe595f6591867850b8730b2e14 100644 (file)
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -18,7 +18,6 @@
 #include <linux/timer.h>
 #include <linux/completion.h>
 #include <linux/platform_device.h>
-#include <linux/i2c-pnx.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/clk.h>
@@ -29,6 +28,26 @@
 #define I2C_PNX_SPEED_KHZ_DEFAULT      100
 #define I2C_PNX_REGION_SIZE            0x100
 
+struct i2c_pnx_mif {
+       int                     ret;            /* Return value */
+       int                     mode;           /* Interface mode */
+       struct completion       complete;       /* I/O completion */
+       struct timer_list       timer;          /* Timeout */
+       u8 *                    buf;            /* Data buffer */
+       int                     len;            /* Length of data buffer */
+       int                     order;          /* RX Bytes to order via TX */
+};
+
+struct i2c_pnx_algo_data {
+       void __iomem            *ioaddr;
+       struct i2c_pnx_mif      mif;
+       int                     last;
+       struct clk              *clk;
+       struct i2c_adapter      adapter;
+       int                     irq;
+       u32                     timeout;
+};
+
 enum {
        mstatus_tdi = 0x00000001,
        mstatus_afi = 0x00000002,

diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h
deleted file mode 100644 (file)
index 5388326..0000000
--- a/include/linux/i2c-pnx.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Header file for I2C support on PNX010x/4008.
- *
- * Author: Dennis Kovalev <dkovalev@ru.mvista.com>
- *
- * 2004-2006 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#ifndef __I2C_PNX_H__
-#define __I2C_PNX_H__
-
-struct platform_device;
-struct clk;
-
-struct i2c_pnx_mif {
-       int                     ret;            /* Return value */
-       int                     mode;           /* Interface mode */
-       struct completion       complete;       /* I/O completion */
-       struct timer_list       timer;          /* Timeout */
-       u8 *                    buf;            /* Data buffer */
-       int                     len;            /* Length of data buffer */
-       int                     order;          /* RX Bytes to order via TX */
-};
-
-struct i2c_pnx_algo_data {
-       void __iomem            *ioaddr;
-       struct i2c_pnx_mif      mif;
-       int                     last;
-       struct clk              *clk;
-       struct i2c_adapter      adapter;
-       int                     irq;
-       u32                     timeout;
-};
-
-#endif /* __I2C_PNX_H__ */