Re: [PATCH 01/24] use IS_ENABLED() macro

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Jan 21, 2013 at 10:47 AM, Hans de Goede <hdegoede@xxxxxxxxxx> 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@xxxxxxxxxx>
>> Signed-off-by: Peter Senna Tschudin <peter.senna@xxxxxxxxx>
>> ---
>>   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 kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Kernel Development]     [Kernel Announce]     [Kernel Newbies]     [Linux Networking Development]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Device Mapper]

  Powered by Linux