[PATCH] spi-imx: Remove duplicate spi_imx_data definition

[PATCH] spi-imx: Remove duplicate spi_imx_data definition

[Fabio Estevam]

Structure struct spi_imx_data is defined twice.

Remove one of its definition.

Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
 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

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

[Shubhrajyoti Datta]

Hi Fabio,

On Mon, Mar 26, 2012 at 11:43 PM, Fabio Estevam
<fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org> wrote:
> Structure struct spi_imx_data is defined twice.
>
> Remove one of its definition.
>
> Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
> ---
>  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;
> -};

Is this change intentional

> -
>  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
> _______________________________________________
> spi-devel-general mailing list
> spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> https://lists.sourceforge.net/lists/listinfo/spi-devel-general

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

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

[Fabio Estevam]

Shubhrajyoti Datta wrote:
> Hi Fabio,
> 
> On Mon, Mar 26, 2012 at 11:43 PM, Fabio Estevam
> <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org> wrote:
>> Structure struct spi_imx_data is defined twice.
>>
>> Remove one of its definition.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
>> ---
>>  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;
>> -};
> 
> Is this change intentional

Yes, struct spi_imx_data must be defined prior to spi_imx_devtype_data.

Thanks,

Fabio Estevam


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

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

[Shubhrajyoti Datta]

Hi Fabio,

On Tue, Mar 27, 2012 at 12:34 AM, Fabio Estevam
<fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org> wrote:
> Shubhrajyoti Datta wrote:
>> Hi Fabio,
>>
>> On Mon, Mar 26, 2012 at 11:43 PM, Fabio Estevam
>> <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org> wrote:
>>> Structure struct spi_imx_data is defined twice.
>>>
>>> Remove one of its definition.
>>>
>>> Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
>>> ---
>>>  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;
>>> -};
>>
>> Is this change intentional
>
> Yes, struct spi_imx_data must be defined prior to spi_imx_devtype_data.
>
How about specifying in the changelogs.
> Thanks,
>
> Fabio Estevam
>
>
> ------------------------------------------------------------------------------
> This SF email is sponsosred by:
> Try Windows Azure free for 90 days Click Here
> http://p.sf.net/sfu/sfd2d-msazure
> _______________________________________________
> spi-devel-general mailing list
> spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> https://lists.sourceforge.net/lists/listinfo/spi-devel-general

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

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

[Uwe Kleine-König]

On Mon, Mar 26, 2012 at 03:13:52PM -0300, Fabio Estevam wrote:
> Structure struct spi_imx_data is defined twice.
> 
> Remove one of its definition.
In my version of drivers/spi/spi-imx.c struct spi_imx_data is only
defined once. I guess you wanted to say "forward declaration".

> Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
> ---
>  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;
> +};
> +
Does this really work? struct spi_imx_data has a member

	struct spi_imx_devtype_data *devtype_data;

. So when reordering you can drop the forward definition of
spi_imx_data, but don't you need another one for spi_imx_devtype_data?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

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

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

[Fabio Estevam]

On 3/26/2012 5:59 PM, Uwe Kleine-König wrote:

> In my version of drivers/spi/spi-imx.c struct spi_imx_data is only
> defined once. I guess you wanted to say "forward declaration".

Yes, correct.

...

> Does this really work? struct spi_imx_data has a member

Yes, tested it on a mx31pdk board.

Regards,

Fabio Estevam




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

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

[Uwe Kleine-König]

Hello Fabio,

On Mon, Mar 26, 2012 at 11:19:42PM -0300, Fabio Estevam wrote:
> On 3/26/2012 5:59 PM, Uwe Kleine-König wrote:
> 
> > In my version of drivers/spi/spi-imx.c struct spi_imx_data is only
> > defined once. I guess you wanted to say "forward declaration".
> 
> Yes, correct.
> 
> ...
> 
> > Does this really work? struct spi_imx_data has a member
> 
> Yes, tested it on a mx31pdk board.
Strange, I can confirm it compiles without warnings. Even sparse doesn't
complain about it. I don't understand it. *shrug*

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

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

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

[Grant Likely]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 830 bytes --]

On Tue, 27 Mar 2012 09:01:35 +0200, Uwe Kleine-König <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> wrote:
> Hello Fabio,
> 
> On Mon, Mar 26, 2012 at 11:19:42PM -0300, Fabio Estevam wrote:
> > On 3/26/2012 5:59 PM, Uwe Kleine-König wrote:
> > 
> > > In my version of drivers/spi/spi-imx.c struct spi_imx_data is only
> > > defined once. I guess you wanted to say "forward declaration".
> > 
> > Yes, correct.
> > 
> > ...
> > 
> > > Does this really work? struct spi_imx_data has a member
> > 
> > Yes, tested it on a mx31pdk board.
> Strange, I can confirm it compiles without warnings. Even sparse doesn't
> complain about it. I don't understand it. *shrug*

Still doesn't look right though because there needs to be a forward
declaration for spi_imx_devtype_data before it is used.  I'm not going
to apply.

g.



[-- Attachment #2: Type: text/plain, Size: 191 bytes --]

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

[-- Attachment #3: Type: text/plain, Size: 210 bytes --]

_______________________________________________
spi-devel-general mailing list
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/spi-devel-general