[PATCH v2] spi-imx: Remove duplicate spi_imx_data definition

[PATCH v2] spi-imx: Remove duplicate spi_imx_data definition

[Fabio Estevam]

Structure struct spi_imx_data is defined twice.

Remove one of its definition.

In order to do so, it is also necessary to move spi_imx_devtype_data 
structure after the definition of spi_imx_data.

Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
Changes since v1:
- Explain why I moved spi_imx_devtype_data location
 drivers/spi/spi-imx.c |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 31054e3..f1f6700 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -68,17 +68,6 @@ enum spi_imx_devtype {
 	IMX51_ECSPI,	/* ECSPI on i.mx51 and later */
 };
 
-struct spi_imx_data;
-
-struct spi_imx_devtype_data {
-	void (*intctrl)(struct spi_imx_data *, int);
-	int (*config)(struct spi_imx_data *, struct spi_imx_config *);
-	void (*trigger)(struct spi_imx_data *);
-	int (*rx_available)(struct spi_imx_data *);
-	void (*reset)(struct spi_imx_data *);
-	enum spi_imx_devtype devtype;
-};
-
 struct spi_imx_data {
 	struct spi_bitbang bitbang;
 
@@ -99,6 +88,15 @@ struct spi_imx_data {
 	int chipselect[0];
 };
 
+struct spi_imx_devtype_data {
+	void (*intctrl)(struct spi_imx_data *, int);
+	int (*config)(struct spi_imx_data *, struct spi_imx_config *);
+	void (*trigger)(struct spi_imx_data *);
+	int (*rx_available)(struct spi_imx_data *);
+	void (*reset)(struct spi_imx_data *);
+	enum spi_imx_devtype devtype;
+};
+
 static inline int is_imx27_cspi(struct spi_imx_data *d)
 {
 	return d->devtype_data->devtype == IMX27_CSPI;
-- 
1.7.1



------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure