From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752273AbbCYMCs (ORCPT ); Wed, 25 Mar 2015 08:02:48 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:33941 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750724AbbCYMCp (ORCPT ); Wed, 25 Mar 2015 08:02:45 -0400 X-AuditID: cbfee61b-f79d76d0000024d6-a5-5512a3e333a8 From: Bartlomiej Zolnierkiewicz To: Johan Hovold Cc: Lee Jones , Support Opensource , Samuel Ortiz , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, Milo Kim , patches@opensource.wolfsonmicro.com, Fabio Estevam , Marek Szyprowski , stable Subject: Re: [PATCH 2/2] mfd: core: fix platform-device name collisions Date: Wed, 25 Mar 2015 13:02:36 +0100 Message-id: <8499203.iFuRDWiNfB@amdc1032> User-Agent: KMail/4.8.4 (Linux/3.2.0-70-generic-pae; KDE/4.8.5; i686; ; ) In-reply-to: <1427281625-31241-2-git-send-email-johan@kernel.org> References: <20150325110231.GC10412@localhost> <1427281625-31241-1-git-send-email-johan@kernel.org> <1427281625-31241-2-git-send-email-johan@kernel.org> MIME-version: 1.0 Content-transfer-encoding: 7Bit Content-type: text/plain; charset=ISO-8859-1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xgO7jxUKhBm1b5C2mPnzCZjGrS9ei 6UYPq8X9r0cZLb5d6WCyuLxrDpvF2iN32S2W/1rHYrH87X82i9PdrBYLNj5itNjbepHZgcdj xSd9j3+H+5k8ds66y+6xaVUnm8eda3vYPOadDPR4OfE3m0ffllWMHsdvbGfy+LxJLoArissm JTUnsyy1SN8ugSvj7a0VTAXT+Cqadn1ma2A8x93FyMkhIWAicefya2YIW0ziwr31bF2MXBxC AosYJa686GACSQgJfGOUOHMiEsRmE7CSmNi+irGLkYNDREBZYsobQZB6ZoHVzBLb1sxlB6kR FnCXmLntGyOIzSKgKvHo8E6wOK+ApsSrb+fB4qICnhI7px8AszkFHCU2XvkItXgOo0Rv7wJm iAZBiR+T77GA2MwC8hL79k9lhbB1JPa3TmObwCgwC0nZLCRls5CULWBkXsUomlqQXFCclJ5r pFecmFtcmpeul5yfu4kRHEPPpHcwrmqwOMQowMGoxMPrISIUKsSaWFZcmXuIUYKDWUmE99VC oBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFeJfu2ECGB9MSS1OzU1ILUIpgsEwenVAMj1/rpR+qa b9UXhr3d/uf0o1AFizi5Ve+Yl/64u69N94394dbT3x2ZvywXfzf9Y8eSPXNMLf1sT99MjVu+ 7EP64zr/uQ9WxordVwl9f7CcJ1D57rz75fM8pvJvl70vYq6mbtfcJ8+o90JQuXsx6+dvou2r jk89LZi/62f3RM2XW84m7Ov/xPLtlBJLcUaioRZzUXEiAOasZ+edAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Wednesday, March 25, 2015 12:07:05 PM Johan Hovold wrote: > Since commit 6e3f62f0793e ("mfd: core: Fix platform-device id > generation") we honour PLATFORM_DEVID_AUTO and PLATFORM_DEVID_NONE when > registering mfd-devices. > > Unfortunately, some mfd-drivers rely on the old behaviour of generating > platform-device ids by adding the cell id also to the special value of > PLATFORM_DEVID_NONE. The resulting platform ids are not only used to > generate device-unique names, but are also used instead of the cell id > to identify cells when probing subdevices. > > These drivers should be updated to use PLATFORM_DEVID_AUTO, which would > also allow more than one device to be registered without resorting to > hacks (see for example wm831x), but lets fix the regression first by > partially reverting the above mentioned commit with respect to > PLATFORM_DEVID_NONE. > > Fixes: 6e3f62f0793e ("mfd: core: Fix platform-device id generation") > Cc: stable # v3.19 > Reported-by: Bartlomiej Zolnierkiewicz > Signed-off-by: Johan Hovold Acked-by: Bartlomiej Zolnierkiewicz Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > --- > drivers/mfd/mfd-core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c > index 2a87f69be53d..1aed3b7b8d9b 100644 > --- a/drivers/mfd/mfd-core.c > +++ b/drivers/mfd/mfd-core.c > @@ -128,7 +128,7 @@ static int mfd_add_device(struct device *parent, int id, > int platform_id; > int r; > > - if (id < 0) > + if (id == PLATFORM_DEVID_AUTO) > platform_id = id; > else > platform_id = id + cell->id;