| Message ID | 1358613206-4274-1-git-send-email-peter.senna@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Peter Senna Tschudin <peter.senna@gmail.com> writes: > replace: > #if defined(CONFIG_VIDEO_CX88_DVB) || \ > defined(CONFIG_VIDEO_CX88_DVB_MODULE) > with: > #if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) > > This change was made for: CONFIG_VIDEO_CX88_DVB, > CONFIG_VIDEO_CX88_BLACKBIRD, CONFIG_VIDEO_CX88_VP3054 > > Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com> > Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> > --- > drivers/media/pci/cx88/cx88.h | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) sorry, all patch-set have same 'use IS_ENABLED() macro'. not wise. at least prefix it by subsystem, driver or whatever useful.
Hi, Thanks for the patches I'll pick up 5 - 21 and add them to my tree for Mauro. Regards, Hans On 01/19/2013 05:33 PM, Peter Senna Tschudin wrote: > replace: > #if defined(CONFIG_VIDEO_CX88_DVB) || \ > defined(CONFIG_VIDEO_CX88_DVB_MODULE) > with: > #if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) > > This change was made for: CONFIG_VIDEO_CX88_DVB, > CONFIG_VIDEO_CX88_BLACKBIRD, CONFIG_VIDEO_CX88_VP3054 > > Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com> > Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> > --- > drivers/media/pci/cx88/cx88.h | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h > index ba0dba4..feff53c 100644 > --- a/drivers/media/pci/cx88/cx88.h > +++ b/drivers/media/pci/cx88/cx88.h > @@ -363,7 +363,7 @@ struct cx88_core { > unsigned int tuner_formats; > > /* config info -- dvb */ > -#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) > +#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) > int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage); > #endif > void (*gate_ctrl)(struct cx88_core *core, int open); > @@ -562,8 +562,7 @@ struct cx8802_dev { > > /* for blackbird only */ > struct list_head devlist; > -#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \ > - defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE) > +#if IS_ENABLED(CONFIG_VIDEO_CX88_BLACKBIRD) > struct video_device *mpeg_dev; > u32 mailbox; > int width; > @@ -574,13 +573,12 @@ struct cx8802_dev { > struct cx2341x_handler cxhdl; > #endif > > -#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) > +#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) > /* for dvb only */ > struct videobuf_dvb_frontends frontends; > #endif > > -#if defined(CONFIG_VIDEO_CX88_VP3054) || \ > - defined(CONFIG_VIDEO_CX88_VP3054_MODULE) > +#if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054) > /* For VP3045 secondary I2C bus support */ > struct vp3054_i2c_state *vp3054; > #endif > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jan 21, 2013 at 10:47 AM, Hans de Goede <hdegoede@redhat.com> wrote: > Hi, > > Thanks for the patches I'll pick up 5 - 21 and add them to > my tree for Mauro. I have sent V2 of this patches with another subject and with fixed commit message for two patches. > > Regards, > > Hans > > > > On 01/19/2013 05:33 PM, Peter Senna Tschudin wrote: >> >> replace: >> #if defined(CONFIG_VIDEO_CX88_DVB) || \ >> defined(CONFIG_VIDEO_CX88_DVB_MODULE) >> with: >> #if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) >> >> This change was made for: CONFIG_VIDEO_CX88_DVB, >> CONFIG_VIDEO_CX88_BLACKBIRD, CONFIG_VIDEO_CX88_VP3054 >> >> Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com> >> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> >> --- >> drivers/media/pci/cx88/cx88.h | 10 ++++------ >> 1 file changed, 4 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h >> index ba0dba4..feff53c 100644 >> --- a/drivers/media/pci/cx88/cx88.h >> +++ b/drivers/media/pci/cx88/cx88.h >> @@ -363,7 +363,7 @@ struct cx88_core { >> unsigned int tuner_formats; >> >> /* config info -- dvb */ >> -#if defined(CONFIG_VIDEO_CX88_DVB) || >> defined(CONFIG_VIDEO_CX88_DVB_MODULE) >> +#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) >> int (*prev_set_voltage)(struct dvb_frontend >> *fe, fe_sec_voltage_t voltage); >> #endif >> void (*gate_ctrl)(struct cx88_core *core, >> int open); >> @@ -562,8 +562,7 @@ struct cx8802_dev { >> >> /* for blackbird only */ >> struct list_head devlist; >> -#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \ >> - defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE) >> +#if IS_ENABLED(CONFIG_VIDEO_CX88_BLACKBIRD) >> struct video_device *mpeg_dev; >> u32 mailbox; >> int width; >> @@ -574,13 +573,12 @@ struct cx8802_dev { >> struct cx2341x_handler cxhdl; >> #endif >> >> -#if defined(CONFIG_VIDEO_CX88_DVB) || >> defined(CONFIG_VIDEO_CX88_DVB_MODULE) >> +#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) >> /* for dvb only */ >> struct videobuf_dvb_frontends frontends; >> #endif >> >> -#if defined(CONFIG_VIDEO_CX88_VP3054) || \ >> - defined(CONFIG_VIDEO_CX88_VP3054_MODULE) >> +#if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054) >> /* For VP3045 secondary I2C bus support */ >> struct vp3054_i2c_state *vp3054; >> #endif >> > -- Peter -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hans de Goede wrote: > Thanks for the patches I'll pick up 5 - 21 and add them to > my tree for Mauro. Ack on patch 1, BTW. Thanks, Jonathan -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On 01/21/2013 01:51 PM, Peter Senna Tschudin wrote: > On Mon, Jan 21, 2013 at 10:47 AM, Hans de Goede <hdegoede@redhat.com> wrote: >> Hi, >> >> Thanks for the patches I'll pick up 5 - 21 and add them to >> my tree for Mauro. > I have sent V2 of this patches with another subject and with fixed > commit message for two patches. Oh, those did not show up in my mailbox though, so I guess you did not send V2 to the linux-media list? Can you please re-send them to the linux-media list, then I'll pick up the gspca patches among them. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em Tue, 22 Jan 2013 10:52:08 +0100 Hans de Goede <hdegoede@redhat.com> escreveu: > Hi, > > On 01/21/2013 01:51 PM, Peter Senna Tschudin wrote: > > On Mon, Jan 21, 2013 at 10:47 AM, Hans de Goede <hdegoede@redhat.com> wrote: > >> Hi, > >> > >> Thanks for the patches I'll pick up 5 - 21 and add them to > >> my tree for Mauro. > > I have sent V2 of this patches with another subject and with fixed > > commit message for two patches. > > Oh, those did not show up in my mailbox though, so I guess you > did not send V2 to the linux-media list? Can you please re-send > them to the linux-media list, then I'll pick up the gspca patches > among them. Hans, Peter sent the version 2 of them on Jan, 19. Did you get them? Anyway, I'll tag patches 5-21 for you as under_review status. Regards, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h index ba0dba4..feff53c 100644 --- a/drivers/media/pci/cx88/cx88.h +++ b/drivers/media/pci/cx88/cx88.h @@ -363,7 +363,7 @@ struct cx88_core { unsigned int tuner_formats; /* config info -- dvb */ -#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage); #endif void (*gate_ctrl)(struct cx88_core *core, int open); @@ -562,8 +562,7 @@ struct cx8802_dev { /* for blackbird only */ struct list_head devlist; -#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \ - defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_CX88_BLACKBIRD) struct video_device *mpeg_dev; u32 mailbox; int width; @@ -574,13 +573,12 @@ struct cx8802_dev { struct cx2341x_handler cxhdl; #endif -#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) /* for dvb only */ struct videobuf_dvb_frontends frontends; #endif -#if defined(CONFIG_VIDEO_CX88_VP3054) || \ - defined(CONFIG_VIDEO_CX88_VP3054_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054) /* For VP3045 secondary I2C bus support */ struct vp3054_i2c_state *vp3054; #endif
replace: #if defined(CONFIG_VIDEO_CX88_DVB) || \ defined(CONFIG_VIDEO_CX88_DVB_MODULE) with: #if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) This change was made for: CONFIG_VIDEO_CX88_DVB, CONFIG_VIDEO_CX88_BLACKBIRD, CONFIG_VIDEO_CX88_VP3054 Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> --- drivers/media/pci/cx88/cx88.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)