From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933127AbbHZA2W (ORCPT ); Tue, 25 Aug 2015 20:28:22 -0400 Received: from mailgw02.mediatek.com ([66.228.70.112]:49024 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S932904AbbHZA2U (ORCPT ); Tue, 25 Aug 2015 20:28:20 -0400 X-Listener-Flag: 11101 Message-ID: <1440548894.14000.1.camel@mussux00.eus.mediatek.inc> Subject: Re: [PATCH v4] pinctrl: mediatek: Fix multiple registration issue. From: Hongzhou Yang To: Linus Walleij CC: Matthias Brugger , Axel Lin , Yingjoe Chen , Antoine Tenart , Maoguang Meng , Masahiro Yamada , Chaotian Jing , , , , , , Sascha Hauer Date: Tue, 25 Aug 2015 17:28:14 -0700 In-Reply-To: <1440548170-10174-1-git-send-email-hongzhou.yang@mediatek.com> References: <1440548170-10174-1-git-send-email-hongzhou.yang@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N X-TM-AS-Product-Ver: SMEX-10.2.0.3176-8.000.1202-21768.005 X-TM-AS-Result: No--14.873600-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2015-08-25 at 17:16 -0700, Hongzhou Yang wrote: > Since our common driver need support main chip and PMU > at the same time, that means it will register two > pinctrl device, and the pinctrl_desc structure should > be used two times. > > But pinctrl_desc use global static definition, then > the latest registered pinctrl device will overwrite > the old one's, all members in pinctrl_desc will set to > the new one's, such as name, pins and pins numbers, etc. > This is a bug. Changing to use devm_kzalloc to fix it. > > Cc: stable@vger.kernel.org # v4.1+ > Signed-off-by: Hongzhou Yang > Reviewed-by: Axel Lin > --- > Adding pinctrl_desc into mtk_pinctrl, assign new value for each > pinctrl device. > > drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 21 ++++++++++----------- > drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 1 + > 2 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c > index ad1ea16..4a52072 100644 > --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c > +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c > @@ -1202,12 +1202,6 @@ static int mtk_pctrl_build_state(struct platform_device *pdev) > return 0; > } > > -static struct pinctrl_desc mtk_pctrl_desc = { > - .confops = &mtk_pconf_ops, > - .pctlops = &mtk_pctrl_ops, > - .pmxops = &mtk_pmx_ops, > -}; > - > int mtk_pctrl_init(struct platform_device *pdev, > const struct mtk_pinctrl_devdata *data, > struct regmap *regmap) > @@ -1265,12 +1259,17 @@ int mtk_pctrl_init(struct platform_device *pdev, > > for (i = 0; i < pctl->devdata->npins; i++) > pins[i] = pctl->devdata->pins[i].pin; > - mtk_pctrl_desc.name = dev_name(&pdev->dev); > - mtk_pctrl_desc.owner = THIS_MODULE; > - mtk_pctrl_desc.pins = pins; > - mtk_pctrl_desc.npins = pctl->devdata->npins; > + > + pctl->pctl_desc.name = dev_name(&pdev->dev); > + pctl->pctl_desc.owner = THIS_MODULE; > + pctl->pctl_desc.pins = pins; > + pctl->pctl_desc.npins = pctl->devdata->npins; > + pctl->pctl_desc.confops = &mtk_pconf_ops; > + pctl->pctl_desc.pctlops = &mtk_pctrl_ops; > + pctl->pctl_desc.pmxops = &mtk_pmx_ops; > pctl->dev = &pdev->dev; > - pctl->pctl_dev = pinctrl_register(&mtk_pctrl_desc, &pdev->dev, pctl); > + > + pctl->pctl_dev = pinctrl_register(&pctl->pctl_desc, &pdev->dev, pctl); > if (IS_ERR(pctl->pctl_dev)) { > dev_err(&pdev->dev, "couldn't register pinctrl driver\n"); > return PTR_ERR(pctl->pctl_dev); > diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h > index 30213e5..c532c23 100644 > --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h > +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h > @@ -256,6 +256,7 @@ struct mtk_pinctrl_devdata { > struct mtk_pinctrl { > struct regmap *regmap1; > struct regmap *regmap2; > + struct pinctrl_desc pctl_desc; > struct device *dev; > struct gpio_chip *chip; > struct mtk_pinctrl_group *groups; Please ignore this patch, I will send another one. Sorry about this. Yours, Hongzhou