From: Lee Jones <lee.jones@linaro.org>
To: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Cc: sameo@linux.intel.com, patches@opensource.wolfsonmicro.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 5/6 RESEND] mfd: arizona: Remove use of codec build config #ifdefs
Date: Thu, 1 Oct 2015 12:44:52 +0100 [thread overview]
Message-ID: <20151001114452.GP3214@x1> (raw)
In-Reply-To: <1443444406-30518-6-git-send-email-rf@opensource.wolfsonmicro.com>
On Mon, 28 Sep 2015, Richard Fitzgerald wrote:
> Remove the use of #ifdefs around each case statement of the chip ID
> and type validation switches.
>
> We must ensure that the contained code still compiles to nothing if
> support for that codec was not built into the kernel, to prevent
> creation of link references to missing functions. So the ifdefs are
> replaced with a use of the IS_ENABLED() macro.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/arizona-core.c | 29 +++++++++++++++++++++--------
> drivers/mfd/arizona-i2c.c | 28 +++++++++++++++-------------
> drivers/mfd/arizona-spi.c | 18 +++++++++++-------
> 3 files changed, 47 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index 2512192..cc2117e 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -1130,22 +1130,26 @@ int arizona_dev_init(struct arizona *arizona)
> arizona->rev &= ARIZONA_DEVICE_REVISION_MASK;
>
> switch (reg) {
> -#ifdef CONFIG_MFD_WM5102
> case 0x5102:
> + if (!IS_ENABLED(CONFIG_MFD_WM5102))
> + break;
> +
Are you sure this statement effects the code below?
I'm not sure it will. How have you tested it?
> type_name = "WM5102";
> if (arizona->type != WM5102) {
> dev_warn(arizona->dev, "WM5102 registered as %d\n",
> arizona->type);
> arizona->type = WM5102;
> }
> +
> apply_patch = wm5102_patch;
> arizona->rev &= 0x7;
> subdevs = wm5102_devs;
> n_subdevs = ARRAY_SIZE(wm5102_devs);
> break;
> -#endif
> -#ifdef CONFIG_MFD_WM5110
> case 0x5110:
> + if (!IS_ENABLED(CONFIG_MFD_WM5110))
> + break;
> +
> switch (arizona->type) {
> case WM5110:
> type_name = "WM5110";
> @@ -1160,26 +1164,30 @@ int arizona_dev_init(struct arizona *arizona)
> arizona->type = WM5110;
> break;
> }
> +
> apply_patch = wm5110_patch;
> subdevs = wm5110_devs;
> n_subdevs = ARRAY_SIZE(wm5110_devs);
> break;
> -#endif
> -#ifdef CONFIG_MFD_WM8997
> case 0x8997:
> + if (!IS_ENABLED(CONFIG_MFD_WM8997))
> + break;
> +
> type_name = "WM8997";
> if (arizona->type != WM8997) {
> dev_warn(arizona->dev, "WM8997 registered as %d\n",
> arizona->type);
> arizona->type = WM8997;
> }
> +
> apply_patch = wm8997_patch;
> subdevs = wm8997_devs;
> n_subdevs = ARRAY_SIZE(wm8997_devs);
> break;
> -#endif
> -#ifdef CONFIG_MFD_WM8998
> case 0x6349:
> + if (!IS_ENABLED(CONFIG_MFD_WM8998))
> + break;
> +
> switch (arizona->type) {
> case WM8998:
> type_name = "WM8998";
> @@ -1200,12 +1208,17 @@ int arizona_dev_init(struct arizona *arizona)
> subdevs = wm8998_devs;
> n_subdevs = ARRAY_SIZE(wm8998_devs);
> break;
> -#endif
> default:
> dev_err(arizona->dev, "Unknown device ID %x\n", reg);
> goto err_reset;
> }
>
> + if (!subdevs) {
> + dev_err(arizona->dev,
> + "No kernel support for device ID %x\n", reg);
> + goto err_reset;
> + }
> +
> dev_info(dev, "%s revision %c\n", type_name, arizona->rev + 'A');
>
> if (apply_patch) {
> diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
> index cea1b40..914bdce 100644
> --- a/drivers/mfd/arizona-i2c.c
> +++ b/drivers/mfd/arizona-i2c.c
> @@ -27,7 +27,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c,
> const struct i2c_device_id *id)
> {
> struct arizona *arizona;
> - const struct regmap_config *regmap_config;
> + const struct regmap_config *regmap_config = NULL;
> unsigned long type;
> int ret;
>
> @@ -37,34 +37,36 @@ static int arizona_i2c_probe(struct i2c_client *i2c,
> type = id->driver_data;
>
> switch (type) {
> -#ifdef CONFIG_MFD_WM5102
> case WM5102:
> - regmap_config = &wm5102_i2c_regmap;
> + if (IS_ENABLED(CONFIG_MFD_WM5102))
> + regmap_config = &wm5102_i2c_regmap;
> break;
> -#endif
> -#ifdef CONFIG_MFD_WM5110
> case WM5110:
> case WM8280:
> - regmap_config = &wm5110_i2c_regmap;
> + if (IS_ENABLED(CONFIG_MFD_WM5110))
> + regmap_config = &wm5110_i2c_regmap;
> break;
> -#endif
> -#ifdef CONFIG_MFD_WM8997
> case WM8997:
> - regmap_config = &wm8997_i2c_regmap;
> + if (IS_ENABLED(CONFIG_MFD_WM8997))
> + regmap_config = &wm8997_i2c_regmap;
> break;
> -#endif
> -#ifdef CONFIG_MFD_WM8998
> case WM8998:
> case WM1814:
> - regmap_config = &wm8998_i2c_regmap;
> + if (IS_ENABLED(CONFIG_MFD_WM8998))
> + regmap_config = &wm8998_i2c_regmap;
> break;
> -#endif
> default:
> dev_err(&i2c->dev, "Unknown device type %ld\n",
> id->driver_data);
> return -EINVAL;
> }
>
> + if (!regmap_config) {
> + dev_err(&i2c->dev,
> + "No kernel support for device type %ld\n", type);
> + return -EINVAL;
> + }
> +
> arizona = devm_kzalloc(&i2c->dev, sizeof(*arizona), GFP_KERNEL);
> if (arizona == NULL)
> return -ENOMEM;
> diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c
> index 1e845f6..850a63a 100644
> --- a/drivers/mfd/arizona-spi.c
> +++ b/drivers/mfd/arizona-spi.c
> @@ -27,7 +27,7 @@ static int arizona_spi_probe(struct spi_device *spi)
> {
> const struct spi_device_id *id = spi_get_device_id(spi);
> struct arizona *arizona;
> - const struct regmap_config *regmap_config;
> + const struct regmap_config *regmap_config = NULL;
> unsigned long type;
> int ret;
>
> @@ -37,23 +37,27 @@ static int arizona_spi_probe(struct spi_device *spi)
> type = id->driver_data;
>
> switch (type) {
> -#ifdef CONFIG_MFD_WM5102
> case WM5102:
> - regmap_config = &wm5102_spi_regmap;
> + if (IS_ENABLED(CONFIG_MFD_WM5102))
> + regmap_config = &wm5102_spi_regmap;
> break;
> -#endif
> -#ifdef CONFIG_MFD_WM5110
> case WM5110:
> case WM8280:
> - regmap_config = &wm5110_spi_regmap;
> + if (IS_ENABLED(CONFIG_MFD_WM5110))
> + regmap_config = &wm5110_spi_regmap;
> break;
> -#endif
> default:
> dev_err(&spi->dev, "Unknown device type %ld\n",
> id->driver_data);
> return -EINVAL;
> }
>
> + if (!regmap_config) {
> + dev_err(&spi->dev,
> + "No kernel support for device type %ld\n", type);
> + return -EINVAL;
> + }
> +
> arizona = devm_kzalloc(&spi->dev, sizeof(*arizona), GFP_KERNEL);
> if (arizona == NULL)
> return -ENOMEM;
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2015-10-01 11:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-28 12:46 [PATCH 0/6 RESEND] mfd: arizona: Various improvements and refactoring Richard Fitzgerald
2015-09-28 12:46 ` [PATCH 1/6 RESEND] mfd: arizona: factor out DCVDD isolation control Richard Fitzgerald
2015-09-28 12:46 ` [PATCH 2/6 RESEND] mfd: arizona: factor out checking of jack detection state Richard Fitzgerald
2015-09-28 12:46 ` [PATCH 3/6 RESEND] mfd: arizona: Downgrade type mismatch messages to dev_warn Richard Fitzgerald
2015-10-01 11:17 ` Lee Jones
2015-09-28 12:46 ` [PATCH 4/6 RESEND] mfd: arizona: Simplify adding subdevices Richard Fitzgerald
2015-10-01 11:41 ` Lee Jones
2015-09-28 12:46 ` [PATCH 5/6 RESEND] mfd: arizona: Remove use of codec build config #ifdefs Richard Fitzgerald
2015-10-01 11:44 ` Lee Jones [this message]
2015-10-02 9:23 ` Charles Keepax
2015-09-28 12:46 ` [PATCH 6/6 RESEND] mfd: arizona: use correct type ID for device tree config Richard Fitzgerald
2015-10-01 11:46 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151001114452.GP3214@x1 \
--to=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
--cc=rf@opensource.wolfsonmicro.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.