On Fri, 02 Oct 2015, Charles Keepax wrote:
> From: Richard Fitzgerald <[email protected]>
>
> The code was using a switch on the code type to execute
> one of several mfd_add_devices() calls. We're already
> switching on the code type earlier in the function to
> select the correct patch function so we can roll selection
> of the mfd device table into the same switch.
>
> Signed-off-by: Richard Fitzgerald <[email protected]>
> Acked-by: Lee Jones <[email protected]>
> Signed-off-by: Charles Keepax <[email protected]>
> ---
> drivers/mfd/arizona-core.c | 36 ++++++++++++++----------------------
> 1 files changed, 14 insertions(+), 22 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index c3f88e5..39899bf 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -24,6 +24,7 @@
> #include <linux/regulator/consumer.h>
> #include <linux/regulator/machine.h>
> #include <linux/slab.h>
> +#include <linux/platform_device.h>
>
> #include <linux/mfd/arizona/core.h>
> #include <linux/mfd/arizona/registers.h>
> @@ -965,7 +966,8 @@ int arizona_dev_init(struct arizona *arizona)
> const char *type_name;
> unsigned int reg, val, mask;
> int (*apply_patch)(struct arizona *) = NULL;
> - int ret, i;
> + const struct mfd_cell *subdevs = NULL;
> + int n_subdevs, ret, i;
>
> dev_set_drvdata(arizona->dev, arizona);
> mutex_init(&arizona->clk_lock);
> @@ -1136,6 +1138,8 @@ int arizona_dev_init(struct arizona *arizona)
> }
> apply_patch = wm5102_patch;
> arizona->rev &= 0x7;
> + subdevs = wm5102_devs;
> + n_subdevs = ARRAY_SIZE(wm5102_devs);
> break;
> #endif
> #ifdef CONFIG_MFD_WM5110
> @@ -1155,6 +1159,8 @@ int arizona_dev_init(struct arizona *arizona)
> break;
> }
> apply_patch = wm5110_patch;
> + subdevs = wm5110_devs;
> + n_subdevs = ARRAY_SIZE(wm5110_devs);
> break;
> #endif
> #ifdef CONFIG_MFD_WM8997
> @@ -1166,6 +1172,8 @@ int arizona_dev_init(struct arizona *arizona)
> arizona->type = WM8997;
> }
> apply_patch = wm8997_patch;
> + subdevs = wm8997_devs;
> + n_subdevs = ARRAY_SIZE(wm8997_devs);
> break;
> #endif
> #ifdef CONFIG_MFD_WM8998
> @@ -1187,6 +1195,8 @@ int arizona_dev_init(struct arizona *arizona)
> }
>
> apply_patch = wm8998_patch;
> + subdevs = wm8998_devs;
> + n_subdevs = ARRAY_SIZE(wm8998_devs);
> break;
> #endif
> default:
> @@ -1379,28 +1389,10 @@ int arizona_dev_init(struct arizona *arizona)
> arizona_request_irq(arizona, ARIZONA_IRQ_UNDERCLOCKED, "Underclocked",
> arizona_underclocked, arizona);
>
> - switch (arizona->type) {
> - case WM5102:
> - ret = mfd_add_devices(arizona->dev, -1, wm5102_devs,
> - ARRAY_SIZE(wm5102_devs), NULL, 0, NULL);
> - break;
> - case WM5110:
> - case WM8280:
> - ret = mfd_add_devices(arizona->dev, -1, wm5110_devs,
> - ARRAY_SIZE(wm5110_devs), NULL, 0, NULL);
> - break;
> - case WM8997:
> - ret = mfd_add_devices(arizona->dev, -1, wm8997_devs,
> - ARRAY_SIZE(wm8997_devs), NULL, 0, NULL);
> - break;
> - case WM8998:
> - case WM1814:
> - ret = mfd_add_devices(arizona->dev, -1, wm8998_devs,
> - ARRAY_SIZE(wm8998_devs), NULL, 0, NULL);
> - break;
> - }
> + ret = mfd_add_devices(arizona->dev, PLATFORM_DEVID_NONE,
> + subdevs, n_subdevs, NULL, 0, NULL);
>
> - if (ret != 0) {
> + if (ret) {
> dev_err(arizona->dev, "Failed to add subdevices: %d\n", ret);
> goto err_irq;
> }
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
