Re: [PATCH v2] pinctrl: mediatek: Fix multiple registration issue.

2015-08-26 Thread Linus Walleij 
On Thu, Aug 20, 2015 at 5:49 AM, Axel Lin  wrote:
> 2015-08-20 11:38 GMT+08:00 Hongzhou Yang :
>> 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: sta...@vger.kernel.org # v4.1+
>> Signed-off-by: Hongzhou Yang 
>> ---
>>  Use dynamic allocation to fix multiple registration issue.
>>
>>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   26 
>> ++---
>>  drivers/pinctrl/mediatek/pinctrl-mtk-common.h |1 +
>>  2 files changed, 16 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c 
>> b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
>> index ad1ea16..911c736 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= _pconf_ops,
>> -   .pctlops= _pctrl_ops,
>> -   .pmxops = _pmx_ops,
>> -};
>> -
>>  int mtk_pctrl_init(struct platform_device *pdev,
>> const struct mtk_pinctrl_devdata *data,
>> struct regmap *regmap)
>> @@ -1265,12 +1259,22 @@ 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(>dev);
>> -   mtk_pctrl_desc.owner = THIS_MODULE;
>> -   mtk_pctrl_desc.pins = pins;
>> -   mtk_pctrl_desc.npins = pctl->devdata->npins;
>> +
>> +   pctl->pctl_desc = devm_kzalloc(>dev, sizeof(*pctl->pctl_desc),
>> +   GFP_KERNEL);
>> +   if (!pctl->pctl_desc)
>> +   return -ENOMEM;
>> +
>> +   pctl->pctl_desc->name = dev_name(>dev);
>> +   pctl->pctl_desc->owner = THIS_MODULE;
>> +   pctl->pctl_desc->pins = pins;
>> +   pctl->pctl_desc->npins = pctl->devdata->npins;
>> +   pctl->pctl_desc->confops = _pconf_ops;
>> +   pctl->pctl_desc->pctlops = _pctrl_ops;
>> +   pctl->pctl_desc->pmxops = _pmx_ops;
>> pctl->dev = >dev;
>> -   pctl->pctl_dev = pinctrl_register(_pctrl_desc, >dev, pctl);
>> +
>> +   pctl->pctl_dev = pinctrl_register(pctl->pctl_desc, >dev, pctl);
>> if (IS_ERR(pctl->pctl_dev)) {
>> dev_err(>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..93d6f5b 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;
> Use
> struct pinctrl_desc pctl_desc;
>
> Then you can remove the devm_kzalloc.

I agree with Axel, use a true member instead of a pointer
and you get something simpler.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v2] pinctrl: mediatek: Fix multiple registration issue.

2015-08-26 Thread Linus Walleij 
On Thu, Aug 20, 2015 at 5:49 AM, Axel Lin axel@ingics.com wrote:
 2015-08-20 11:38 GMT+08:00 Hongzhou Yang hongzhou.y...@mediatek.com:
 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: sta...@vger.kernel.org # v4.1+
 Signed-off-by: Hongzhou Yang hongzhou.y...@mediatek.com
 ---
  Use dynamic allocation to fix multiple registration issue.

  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   26 
 ++---
  drivers/pinctrl/mediatek/pinctrl-mtk-common.h |1 +
  2 files changed, 16 insertions(+), 11 deletions(-)

 diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c 
 b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
 index ad1ea16..911c736 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,22 @@ 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 = devm_kzalloc(pdev-dev, sizeof(*pctl-pctl_desc),
 +   GFP_KERNEL);
 +   if (!pctl-pctl_desc)
 +   return -ENOMEM;
 +
 +   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..93d6f5b 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;
 Use
 struct pinctrl_desc pctl_desc;

 Then you can remove the devm_kzalloc.

I agree with Axel, use a true member instead of a pointer
and you get something simpler.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v2] pinctrl: mediatek: Fix multiple registration issue.

2015-08-19 Thread Axel Lin 
2015-08-20 11:38 GMT+08:00 Hongzhou Yang :
> 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: sta...@vger.kernel.org # v4.1+
> Signed-off-by: Hongzhou Yang 
> ---
>  Use dynamic allocation to fix multiple registration issue.
>
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   26 
> ++---
>  drivers/pinctrl/mediatek/pinctrl-mtk-common.h |1 +
>  2 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c 
> b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index ad1ea16..911c736 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= _pconf_ops,
> -   .pctlops= _pctrl_ops,
> -   .pmxops = _pmx_ops,
> -};
> -
>  int mtk_pctrl_init(struct platform_device *pdev,
> const struct mtk_pinctrl_devdata *data,
> struct regmap *regmap)
> @@ -1265,12 +1259,22 @@ 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(>dev);
> -   mtk_pctrl_desc.owner = THIS_MODULE;
> -   mtk_pctrl_desc.pins = pins;
> -   mtk_pctrl_desc.npins = pctl->devdata->npins;
> +
> +   pctl->pctl_desc = devm_kzalloc(>dev, sizeof(*pctl->pctl_desc),
> +   GFP_KERNEL);
> +   if (!pctl->pctl_desc)
> +   return -ENOMEM;
> +
> +   pctl->pctl_desc->name = dev_name(>dev);
> +   pctl->pctl_desc->owner = THIS_MODULE;
> +   pctl->pctl_desc->pins = pins;
> +   pctl->pctl_desc->npins = pctl->devdata->npins;
> +   pctl->pctl_desc->confops = _pconf_ops;
> +   pctl->pctl_desc->pctlops = _pctrl_ops;
> +   pctl->pctl_desc->pmxops = _pmx_ops;
> pctl->dev = >dev;
> -   pctl->pctl_dev = pinctrl_register(_pctrl_desc, >dev, pctl);
> +
> +   pctl->pctl_dev = pinctrl_register(pctl->pctl_desc, >dev, pctl);
> if (IS_ERR(pctl->pctl_dev)) {
> dev_err(>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..93d6f5b 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;
Use
struct pinctrl_desc pctl_desc;

Then you can remove the devm_kzalloc.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2] pinctrl: mediatek: Fix multiple registration issue.

2015-08-19 Thread Hongzhou Yang 
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: sta...@vger.kernel.org # v4.1+
Signed-off-by: Hongzhou Yang 
---
 Use dynamic allocation to fix multiple registration issue.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   26 ++---
 drivers/pinctrl/mediatek/pinctrl-mtk-common.h |1 +
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c 
b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index ad1ea16..911c736 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= _pconf_ops,
-   .pctlops= _pctrl_ops,
-   .pmxops = _pmx_ops,
-};
-
 int mtk_pctrl_init(struct platform_device *pdev,
const struct mtk_pinctrl_devdata *data,
struct regmap *regmap)
@@ -1265,12 +1259,22 @@ 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(>dev);
-   mtk_pctrl_desc.owner = THIS_MODULE;
-   mtk_pctrl_desc.pins = pins;
-   mtk_pctrl_desc.npins = pctl->devdata->npins;
+
+   pctl->pctl_desc = devm_kzalloc(>dev, sizeof(*pctl->pctl_desc),
+   GFP_KERNEL);
+   if (!pctl->pctl_desc)
+   return -ENOMEM;
+
+   pctl->pctl_desc->name = dev_name(>dev);
+   pctl->pctl_desc->owner = THIS_MODULE;
+   pctl->pctl_desc->pins = pins;
+   pctl->pctl_desc->npins = pctl->devdata->npins;
+   pctl->pctl_desc->confops = _pconf_ops;
+   pctl->pctl_desc->pctlops = _pctrl_ops;
+   pctl->pctl_desc->pmxops = _pmx_ops;
pctl->dev = >dev;
-   pctl->pctl_dev = pinctrl_register(_pctrl_desc, >dev, pctl);
+
+   pctl->pctl_dev = pinctrl_register(pctl->pctl_desc, >dev, pctl);
if (IS_ERR(pctl->pctl_dev)) {
dev_err(>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..93d6f5b 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;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2] pinctrl: mediatek: Fix multiple registration issue.

2015-08-19 Thread Hongzhou Yang 
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: sta...@vger.kernel.org # v4.1+
Signed-off-by: Hongzhou Yang hongzhou.y...@mediatek.com
---
 Use dynamic allocation to fix multiple registration issue.

 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   26 ++---
 drivers/pinctrl/mediatek/pinctrl-mtk-common.h |1 +
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c 
b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index ad1ea16..911c736 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,22 @@ 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 = devm_kzalloc(pdev-dev, sizeof(*pctl-pctl_desc),
+   GFP_KERNEL);
+   if (!pctl-pctl_desc)
+   return -ENOMEM;
+
+   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..93d6f5b 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;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v2] pinctrl: mediatek: Fix multiple registration issue.

2015-08-19 Thread Axel Lin 
2015-08-20 11:38 GMT+08:00 Hongzhou Yang hongzhou.y...@mediatek.com:
 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: sta...@vger.kernel.org # v4.1+
 Signed-off-by: Hongzhou Yang hongzhou.y...@mediatek.com
 ---
  Use dynamic allocation to fix multiple registration issue.

  drivers/pinctrl/mediatek/pinctrl-mtk-common.c |   26 
 ++---
  drivers/pinctrl/mediatek/pinctrl-mtk-common.h |1 +
  2 files changed, 16 insertions(+), 11 deletions(-)

 diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c 
 b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
 index ad1ea16..911c736 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,22 @@ 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 = devm_kzalloc(pdev-dev, sizeof(*pctl-pctl_desc),
 +   GFP_KERNEL);
 +   if (!pctl-pctl_desc)
 +   return -ENOMEM;
 +
 +   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..93d6f5b 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;
Use
struct pinctrl_desc pctl_desc;

Then you can remove the devm_kzalloc.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/