Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754512AbcDYK7J (ORCPT ); Mon, 25 Apr 2016 06:59:09 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:36074 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754233AbcDYK7I (ORCPT ); Mon, 25 Apr 2016 06:59:08 -0400 Date: Mon, 25 Apr 2016 11:59:07 +0100 From: Lee Jones To: Charles Keepax Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: Re: [PATCH] mfd: arizona: Update device ordering to allow clean driver removal Message-ID: <20160425105907.GC2713@dell> References: <1460722727-32623-1-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: <1460722727-32623-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2896 Lines: 93 On Fri, 15 Apr 2016, Charles Keepax wrote: > Since this commit: > > commit b9a8a271c38f ("mfd: make mfd_remove_devices() iterate in reverse > order") > > The order in which the MFD children remove has been reversed, as our > driver contains some dependencies between the devices we need to make > some changes to ensure the driver unloads cleanly. > > Signed-off-by: Charles Keepax > --- > drivers/mfd/arizona-core.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index 5319f25..bf27179 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -908,12 +908,12 @@ static const char * const wm5102_supplies[] = { > > static const struct mfd_cell wm5102_devs[] = { > { .name = "arizona-micsupp" }, > + { .name = "arizona-gpio" }, > { > .name = "arizona-extcon", > .parent_supplies = wm5102_supplies, > .num_parent_supplies = 1, /* We only need MICVDD */ > }, > - { .name = "arizona-gpio" }, > { .name = "arizona-haptics" }, > { .name = "arizona-pwm" }, > { > @@ -925,12 +925,12 @@ static const struct mfd_cell wm5102_devs[] = { > > static const struct mfd_cell wm5110_devs[] = { > { .name = "arizona-micsupp" }, > + { .name = "arizona-gpio" }, > { > .name = "arizona-extcon", > .parent_supplies = wm5102_supplies, > .num_parent_supplies = 1, /* We only need MICVDD */ > }, > - { .name = "arizona-gpio" }, > { .name = "arizona-haptics" }, > { .name = "arizona-pwm" }, > { > @@ -966,12 +966,12 @@ static const char * const wm8997_supplies[] = { > > static const struct mfd_cell wm8997_devs[] = { > { .name = "arizona-micsupp" }, > + { .name = "arizona-gpio" }, > { > .name = "arizona-extcon", > .parent_supplies = wm8997_supplies, > .num_parent_supplies = 1, /* We only need MICVDD */ > }, > - { .name = "arizona-gpio" }, > { .name = "arizona-haptics" }, > { .name = "arizona-pwm" }, > { > @@ -982,12 +982,13 @@ static const struct mfd_cell wm8997_devs[] = { > }; > > static const struct mfd_cell wm8998_devs[] = { > + { .name = "arizona-micsupp" }, > + { .name = "arizona-gpio" }, > { > .name = "arizona-extcon", > .parent_supplies = wm5102_supplies, > .num_parent_supplies = 1, /* We only need MICVDD */ > }, > - { .name = "arizona-gpio" }, > { .name = "arizona-haptics" }, > { .name = "arizona-pwm" }, > { > @@ -995,7 +996,6 @@ static const struct mfd_cell wm8998_devs[] = { > .parent_supplies = wm5102_supplies, > .num_parent_supplies = ARRAY_SIZE(wm5102_supplies), > }, > - { .name = "arizona-micsupp" }, > }; > > int arizona_dev_init(struct arizona *arizona) -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog