Reviewed-by: Michael Krufky <mkrufky@xxxxxxxxxxx>
On Thu, Mar 21, 2013 at 3:39 PM, Mauro Carvalho Chehab
<mchehab@xxxxxxxxxx> wrote:
> Instead of checking everywhere there for 3 symbols, use instead
> IS_ENABLED macro.
>
> This replacement was done using this small perl script:
>
> my $data;
> $data .= $_ while (<>);
> if ($data =~ m/CONFIG_([A-Z\_\d]*)_MODULE/) {
> $data =~ s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ s,defined\(CONFIG_($f)\)[\s\|\&\\\(\)\!]+defined\(CONFIG_($f)_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
>
> $data =~ s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_($f)\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(CONFIG_MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
> $data =~ s,defined\(CONFIG_($f)_MODULE\)[\s\|\&\\\(\)]+defined\(MODULE\)\)*,IS_ENABLED(CONFIG_$f),g;
> }
> print $data;
>
> Cc: Michael Krufky <mkrufky@xxxxxxxxxxx>
> Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
> ---
> drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h | 3 +--
> drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 3 +--
> drivers/media/usb/dvb-usb/dibusb-common.c | 3 +--
> 3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h
> index 432706a..40dd409 100644
> --- a/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h
> +++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h
> @@ -31,8 +31,7 @@ struct mxl111sf_demod_config {
> struct mxl111sf_reg_ctrl_info *ctrl_reg_info);
> };
>
> -#if defined(CONFIG_DVB_USB_MXL111SF) || \
> - (defined(CONFIG_DVB_USB_MXL111SF_MODULE) && defined(MODULE))
> +#if IS_ENABLED(CONFIG_DVB_USB_MXL111SF)
> extern
> struct dvb_frontend *mxl111sf_demod_attach(struct mxl111sf_state *mxl_state,
> struct mxl111sf_demod_config *cfg);
> diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
> index ff33396..634eee3 100644
> --- a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
> +++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
> @@ -60,8 +60,7 @@ struct mxl111sf_tuner_config {
>
> /* ------------------------------------------------------------------------ */
>
> -#if defined(CONFIG_DVB_USB_MXL111SF) || \
> - (defined(CONFIG_DVB_USB_MXL111SF_MODULE) && defined(MODULE))
> +#if IS_ENABLED(CONFIG_DVB_USB_MXL111SF)
> extern
> struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe,
> struct mxl111sf_state *mxl_state,
> diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c
> index af0d432..ecb9360 100644
> --- a/drivers/media/usb/dvb-usb/dibusb-common.c
> +++ b/drivers/media/usb/dvb-usb/dibusb-common.c
> @@ -232,8 +232,7 @@ static struct dibx000_agc_config dib3000p_panasonic_agc_config = {
> .agc2_slope2 = 0x1e,
> };
>
> -#if defined(CONFIG_DVB_DIB3000MC) || \
> - (defined(CONFIG_DVB_DIB3000MC_MODULE) && defined(MODULE))
> +#if IS_ENABLED(CONFIG_DVB_DIB3000MC)
>
> static struct dib3000mc_config mod3000p_dib3000p_config = {
> &dib3000p_panasonic_agc_config,
> --
> 1.8.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
