From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752690AbbJMJYz (ORCPT ); Tue, 13 Oct 2015 05:24:55 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:35200 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752434AbbJMJYx (ORCPT ); Tue, 13 Oct 2015 05:24:53 -0400 Date: Tue, 13 Oct 2015 10:24:49 +0100 From: Lee Jones To: Charles Keepax Cc: patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, rf@opensource.wolfsonmicro.com, sameo@linux.intel.com Subject: Re: [PATCH v2 4/6] mfd: arizona: Simplify adding subdevices Message-ID: <20151013092449.GP32409@x1> References: <1443788955-7523-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1443788955-7523-4-git-send-email-ckeepax@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1443788955-7523-4-git-send-email-ckeepax@opensource.wolfsonmicro.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 02 Oct 2015, Charles Keepax wrote: > From: Richard Fitzgerald > > 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 > Acked-by: Lee Jones > Signed-off-by: Charles Keepax > --- > 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 > #include > #include > +#include > > #include > #include > @@ -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