Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1234103 > unrolled thread
| Started by | Richard Fitzgerald <rf@opensource.wolfsonmicro.com> |
|---|---|
| First post | 2015-09-28 14:50 +0200 |
| Last post | 2015-10-01 13:50 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 4/6 RESEND] mfd: arizona: Simplify adding subdevices Richard Fitzgerald <rf@opensource.wolfsonmicro.com> - 2015-09-28 14:50 +0200
Re: [PATCH 4/6 RESEND] mfd: arizona: Simplify adding subdevices Lee Jones <lee.jones@linaro.org> - 2015-10-01 13:50 +0200
| From | Richard Fitzgerald <rf@opensource.wolfsonmicro.com> |
|---|---|
| Date | 2015-09-28 14:50 +0200 |
| Subject | [PATCH 4/6 RESEND] mfd: arizona: Simplify adding subdevices |
| Message-ID | <qdG2u-5Zh-5@gated-at.bofh.it> |
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 <rf@opensource.wolfsonmicro.com>
---
drivers/mfd/arizona-core.c | 36 ++++++++++++++----------------------
1 file changed, 14 insertions(+), 22 deletions(-)
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index cb09172..2512192 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>
@@ -967,7 +968,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);
@@ -1138,6 +1140,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
@@ -1157,6 +1161,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
@@ -1168,6 +1174,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
@@ -1189,6 +1197,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;
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Lee Jones <lee.jones@linaro.org> |
|---|---|
| Date | 2015-10-01 13:50 +0200 |
| Message-ID | <qeKx4-2WG-5@gated-at.bofh.it> |
| In reply to | #1234103 |
On Mon, 28 Sep 2015, Richard Fitzgerald wrote:
> 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 <rf@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/arizona-core.c | 36 ++++++++++++++----------------------
> 1 file changed, 14 insertions(+), 22 deletions(-)
For my own reference:
Acked-by: Lee Jones <lee.jones@linaro.org>
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index cb09172..2512192 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>
> @@ -967,7 +968,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);
> @@ -1138,6 +1140,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
> @@ -1157,6 +1161,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
> @@ -1168,6 +1174,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
> @@ -1189,6 +1197,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 majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web