2015-12-22 10:27:28

by Okash Khawaja

Subject: [PATCH] next: media: cx231xx: add #ifdef to fix compile error

Compiling linux-next gave this warning:

drivers/media/usb/cx231xx/cx231xx-cards.c: In function
‘cx231xx_usb_probe’:
drivers/media/usb/cx231xx/cx231xx-cards.c:1754:36: error: ‘struct
cx231xx’ has no member named ‘media_dev’
retval = media_device_register(dev->media_dev);

Looking at the refactoring in past two commits, following seems like a
decent fix, i.e. to surround dev->media_dev by #ifdef
CONFIG_MEDIA_CONTROLLER.

Signed-off-by: Okash Khawaja <[email protected]>
---
drivers/media/usb/cx231xx/cx231xx-cards.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 35692d1..220a5db 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -1751,7 +1751,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
if (retval < 0)
goto done;

+#ifdef CONFIG_MEDIA_CONTROLLER
retval = media_device_register(dev->media_dev);
+#endif

done:
if (retval < 0)
--
2.5.2

2015-12-22 12:46:29

by Javier Martinez Canillas

Subject: Re: [PATCH] next: media: cx231xx: add #ifdef to fix compile error

Hello Okash,

On 12/22/2015 07:27 AM, Okash Khawaja wrote:
> Compiling linux-next gave this warning:
>
> drivers/media/usb/cx231xx/cx231xx-cards.c: In function
> ‘cx231xx_usb_probe’:
> drivers/media/usb/cx231xx/cx231xx-cards.c:1754:36: error: ‘struct
> cx231xx’ has no member named ‘media_dev’
> retval = media_device_register(dev->media_dev);
>
> Looking at the refactoring in past two commits, following seems like a
> decent fix, i.e. to surround dev->media_dev by #ifdef
> CONFIG_MEDIA_CONTROLLER.
>
> Signed-off-by: Okash Khawaja <[email protected]>
> ---
> drivers/media/usb/cx231xx/cx231xx-cards.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
> index 35692d1..220a5db 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-cards.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
> @@ -1751,7 +1751,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
> if (retval < 0)
> goto done;
>
> +#ifdef CONFIG_MEDIA_CONTROLLER
> retval = media_device_register(dev->media_dev);
> +#endif
>
> done:
> if (retval < 0)
>

Thanks for your patch, I've posted the same fix already:

https://lkml.org/lkml/2015/12/21/270

Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America

2015-12-22 13:00:41

by Okash Khawaja

Subject: Re: [PATCH] next: media: cx231xx: add #ifdef to fix compile error

On Tue, Dec 22, 2015 at 09:46:19AM -0300, Javier Martinez Canillas wrote:
> Hello Okash,
>
> On 12/22/2015 07:27 AM, Okash Khawaja wrote:
> > Compiling linux-next gave this warning:
> >
> > drivers/media/usb/cx231xx/cx231xx-cards.c: In function
> > ‘cx231xx_usb_probe’:
> > drivers/media/usb/cx231xx/cx231xx-cards.c:1754:36: error: ‘struct
> > cx231xx’ has no member named ‘media_dev’
> > retval = media_device_register(dev->media_dev);
> >
> > Looking at the refactoring in past two commits, following seems like a
> > decent fix, i.e. to surround dev->media_dev by #ifdef
> > CONFIG_MEDIA_CONTROLLER.
> >
> > Signed-off-by: Okash Khawaja <[email protected]>
> > ---
> > drivers/media/usb/cx231xx/cx231xx-cards.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
> > index 35692d1..220a5db 100644
> > --- a/drivers/media/usb/cx231xx/cx231xx-cards.c
> > +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
> > @@ -1751,7 +1751,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
> > if (retval < 0)
> > goto done;
> >
> > +#ifdef CONFIG_MEDIA_CONTROLLER
> > retval = media_device_register(dev->media_dev);
> > +#endif
> >
> > done:
> > if (retval < 0)
> >
>
> Thanks for your patch, I've posted the same fix already:
>
> https://lkml.org/lkml/2015/12/21/270
>
> Best regards,
> --
> Javier Martinez Canillas
> Open Source Group
> Samsung Research America

Cool. There was another similar compile error

https://lkml.org/lkml/2015/12/22/196

Thanks,
Okash

2015-12-22 13:08:56

by Javier Martinez Canillas

Subject: Re: [PATCH] next: media: cx231xx: add #ifdef to fix compile error

Hello Okash,

On 12/22/2015 10:00 AM, Okash Khawaja wrote:

[snip]

>
> Cool. There was another similar compile error
>
> https://lkml.org/lkml/2015/12/22/196
>

Yes and you can see in that thread that I also mention
that was fixed already :)

> Thanks,
> Okash
>

Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America

2015-12-22 13:37:03

by Okash Khawaja

Subject: Re: [PATCH] next: media: cx231xx: add #ifdef to fix compile error

> On 22 Dec 2015, at 13:08, Javier Martinez Canillas <[email protected]> wrote:
>
> Hello Okash,
>
> On 12/22/2015 10:00 AM, Okash Khawaja wrote:
>
> [snip]
>
>>
>> Cool. There was another similar compile error
>>
>> https://lkml.org/lkml/2015/12/22/196
>
> Yes and you can see in that thread that I also mention
> that was fixed already :)
>
>> Thanks,
>> Okash
>
> Best regards,
> --
> Javier Martinez Canillas
> Open Source Group
> Samsung Research America

Of course! I'm blind. -