Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/818619/?format=api
{ "id": 818619, "url": "http://patchwork.ozlabs.org/api/patches/818619/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-gpio/patch/b4b642e7134a9031a73204c56f1e8515d12e9d65.1506428208.git-series.quentin.schulz@free-electrons.com/", "project": { "id": 42, "url": "http://patchwork.ozlabs.org/api/projects/42/?format=api", "name": "Linux GPIO development", "link_name": "linux-gpio", "list_id": "linux-gpio.vger.kernel.org", "list_email": "linux-gpio@vger.kernel.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<b4b642e7134a9031a73204c56f1e8515d12e9d65.1506428208.git-series.quentin.schulz@free-electrons.com>", "list_archive_url": null, "date": "2017-09-26T12:17:14", "name": "[v2,04/10] pinctrl: axp209: rename everything from gpio to pctl", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "d90b7abf363335529b428e14ba184bc66cb23469", "submitter": { "id": 69366, "url": "http://patchwork.ozlabs.org/api/people/69366/?format=api", "name": "Quentin Schulz", "email": "quentin.schulz@free-electrons.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-gpio/patch/b4b642e7134a9031a73204c56f1e8515d12e9d65.1506428208.git-series.quentin.schulz@free-electrons.com/mbox/", "series": [ { "id": 5123, "url": "http://patchwork.ozlabs.org/api/series/5123/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-gpio/list/?series=5123", "date": "2017-09-26T12:17:17", "name": "add pinmuxing support for pins in AXP209 and AXP813 PMICs", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/5123/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/818619/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/818619/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linux-gpio-owner@vger.kernel.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-gpio-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y1g5l50GBz9tXf\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 26 Sep 2017 22:20:43 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S966529AbdIZMTz (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tTue, 26 Sep 2017 08:19:55 -0400", "from mail.free-electrons.com ([62.4.15.54]:52117 \"EHLO\n\tmail.free-electrons.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S966193AbdIZMSI (ORCPT\n\t<rfc822; linux-gpio@vger.kernel.org>); Tue, 26 Sep 2017 08:18:08 -0400", "by mail.free-electrons.com (Postfix, from userid 110)\n\tid 9B1E520860; Tue, 26 Sep 2017 14:18:05 +0200 (CEST)", "from localhost.localdomain\n\t(LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 34B4F20867;\n\tTue, 26 Sep 2017 14:17:55 +0200 (CEST)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com", "X-Spam-Level": "", "X-Spam-Status": "No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0", "From": "Quentin Schulz <quentin.schulz@free-electrons.com>", "To": "linus.walleij@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com,\n\twens@csie.org, linux@armlinux.org.uk,\n\tmaxime.ripard@free-electrons.com, lee.jones@linaro.org", "Cc": "linux-gpio@vger.kernel.org, devicetree@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,\n\tlinux-sunxi@googlegroups.com, thomas.petazzoni@free-electrons.com,\n\tQuentin Schulz <quentin.schulz@free-electrons.com>", "Subject": "[PATCH v2 04/10] pinctrl: axp209: rename everything from gpio to\n\tpctl", "Date": "Tue, 26 Sep 2017 14:17:14 +0200", "Message-Id": "<b4b642e7134a9031a73204c56f1e8515d12e9d65.1506428208.git-series.quentin.schulz@free-electrons.com>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": [ "<cover.1c314f4154a6d27354625f03d0a5269eee55a9c5.1506428208.git-series.quentin.schulz@free-electrons.com>", "<cover.1c314f4154a6d27354625f03d0a5269eee55a9c5.1506428208.git-series.quentin.schulz@free-electrons.com>" ], "References": [ "<cover.1c314f4154a6d27354625f03d0a5269eee55a9c5.1506428208.git-series.quentin.schulz@free-electrons.com>", "<cover.1c314f4154a6d27354625f03d0a5269eee55a9c5.1506428208.git-series.quentin.schulz@free-electrons.com>" ], "Sender": "linux-gpio-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<linux-gpio.vger.kernel.org>", "X-Mailing-List": "linux-gpio@vger.kernel.org" }, "content": "This driver used to do only GPIO features of the GPIOs in X-Powers\nAXP20X. Now that we have migrated everything to the pinctrl subsystem\nand added pinctrl features, rename everything related to pinctrl from\ngpio to pctl to ease the understanding of differences between GPIO\nand pinctrl features.\n\nSigned-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>\n---\n drivers/pinctrl/pinctrl-axp209.c | 198 ++++++++++++++++----------------\n 1 file changed, 99 insertions(+), 99 deletions(-)", "diff": "diff --git a/drivers/pinctrl/pinctrl-axp209.c b/drivers/pinctrl/pinctrl-axp209.c\nindex 4bbcba2..4be1aca 100644\n--- a/drivers/pinctrl/pinctrl-axp209.c\n+++ b/drivers/pinctrl/pinctrl-axp209.c\n@@ -79,7 +79,7 @@ struct axp20x_pinctrl_function {\n \tunsigned int\tngroups;\n };\n \n-struct axp20x_gpio {\n+struct axp20x_pctl {\n \tstruct gpio_chip\tchip;\n \tstruct regmap\t\t*regmap;\n \tstruct pinctrl_dev\t\t\t*pctl_dev;\n@@ -119,11 +119,11 @@ static int axp20x_gpio_input(struct gpio_chip *chip, unsigned offset)\n \n static int axp20x_gpio_get(struct gpio_chip *chip, unsigned offset)\n {\n-\tstruct axp20x_gpio *gpio = gpiochip_get_data(chip);\n+\tstruct axp20x_pctl *pctl = gpiochip_get_data(chip);\n \tunsigned int val;\n \tint ret;\n \n-\tret = regmap_read(gpio->regmap, AXP20X_GPIO20_SS, &val);\n+\tret = regmap_read(pctl->regmap, AXP20X_GPIO20_SS, &val);\n \tif (ret)\n \t\treturn ret;\n \n@@ -132,12 +132,12 @@ static int axp20x_gpio_get(struct gpio_chip *chip, unsigned offset)\n \n static int axp20x_gpio_get_direction(struct gpio_chip *chip, unsigned offset)\n {\n-\tstruct axp20x_gpio *gpio = gpiochip_get_data(chip);\n-\tint reg = (int)gpio->desc->pins[offset].pin.drv_data;\n+\tstruct axp20x_pctl *pctl = gpiochip_get_data(chip);\n+\tint reg = (int)pctl->desc->pins[offset].pin.drv_data;\n \tunsigned int val;\n \tint ret;\n \n-\tret = regmap_read(gpio->regmap, reg, &val);\n+\tret = regmap_read(pctl->regmap, reg, &val);\n \tif (ret)\n \t\treturn ret;\n \n@@ -167,10 +167,10 @@ static int axp20x_gpio_output(struct gpio_chip *chip, unsigned offset,\n static void axp20x_gpio_set(struct gpio_chip *chip, unsigned offset,\n \t\t\t int value)\n {\n-\tstruct axp20x_gpio *gpio = gpiochip_get_data(chip);\n-\tint reg = (int)gpio->desc->pins[offset].pin.drv_data;\n+\tstruct axp20x_pctl *pctl = gpiochip_get_data(chip);\n+\tint reg = (int)pctl->desc->pins[offset].pin.drv_data;\n \n-\tregmap_update_bits(gpio->regmap, reg,\n+\tregmap_update_bits(pctl->regmap, reg,\n \t\t\t AXP20X_GPIO_FUNCTIONS,\n \t\t\t value ? AXP20X_GPIO_FUNCTION_OUT_HIGH :\n \t\t\t AXP20X_GPIO_FUNCTION_OUT_LOW);\n@@ -179,26 +179,26 @@ static void axp20x_gpio_set(struct gpio_chip *chip, unsigned offset,\n static int axp20x_pmx_set(struct pinctrl_dev *pctldev, unsigned int offset,\n \t\t\t u8 config)\n {\n-\tstruct axp20x_gpio *gpio = pinctrl_dev_get_drvdata(pctldev);\n-\tint reg = (int)gpio->desc->pins[offset].pin.drv_data;\n+\tstruct axp20x_pctl *pctl = pinctrl_dev_get_drvdata(pctldev);\n+\tint reg = (int)pctl->desc->pins[offset].pin.drv_data;\n \n-\treturn regmap_update_bits(gpio->regmap, reg, AXP20X_GPIO_FUNCTIONS,\n+\treturn regmap_update_bits(pctl->regmap, reg, AXP20X_GPIO_FUNCTIONS,\n \t\t\t\t config);\n }\n \n static int axp20x_pmx_func_cnt(struct pinctrl_dev *pctldev)\n {\n-\tstruct axp20x_gpio *gpio = pinctrl_dev_get_drvdata(pctldev);\n+\tstruct axp20x_pctl *pctl = pinctrl_dev_get_drvdata(pctldev);\n \n-\treturn gpio->nfunctions;\n+\treturn pctl->nfunctions;\n }\n \n static const char *axp20x_pmx_func_name(struct pinctrl_dev *pctldev,\n \t\t\t\t\tunsigned int selector)\n {\n-\tstruct axp20x_gpio *gpio = pinctrl_dev_get_drvdata(pctldev);\n+\tstruct axp20x_pctl *pctl = pinctrl_dev_get_drvdata(pctldev);\n \n-\treturn gpio->functions[selector].name;\n+\treturn pctl->functions[selector].name;\n }\n \n static int axp20x_pmx_func_groups(struct pinctrl_dev *pctldev,\n@@ -206,24 +206,24 @@ static int axp20x_pmx_func_groups(struct pinctrl_dev *pctldev,\n \t\t\t\t const char * const **groups,\n \t\t\t\t unsigned int *num_groups)\n {\n-\tstruct axp20x_gpio *gpio = pinctrl_dev_get_drvdata(pctldev);\n+\tstruct axp20x_pctl *pctl = pinctrl_dev_get_drvdata(pctldev);\n \n-\t*groups = gpio->functions[selector].groups;\n-\t*num_groups = gpio->functions[selector].ngroups;\n+\t*groups = pctl->functions[selector].groups;\n+\t*num_groups = pctl->functions[selector].ngroups;\n \n \treturn 0;\n }\n \n static struct axp20x_desc_function *\n-axp20x_pinctrl_desc_find_func_by_name(struct axp20x_gpio *gpio,\n+axp20x_pinctrl_desc_find_func_by_name(struct axp20x_pctl *pctl,\n \t\t\t\t const char *group, const char *func)\n {\n \tconst struct axp20x_desc_pin *pin;\n \tstruct axp20x_desc_function *desc_func;\n \tint i;\n \n-\tfor (i = 0; i < gpio->desc->npins; i++) {\n-\t\tpin = &gpio->desc->pins[i];\n+\tfor (i = 0; i < pctl->desc->npins; i++) {\n+\t\tpin = &pctl->desc->pins[i];\n \n \t\tif (!strcmp(pin->pin.name, group)) {\n \t\t\tdesc_func = pin->functions;\n@@ -250,11 +250,11 @@ axp20x_pinctrl_desc_find_func_by_name(struct axp20x_gpio *gpio,\n static int axp20x_pmx_set_mux(struct pinctrl_dev *pctldev,\n \t\t\t unsigned int function, unsigned int group)\n {\n-\tstruct axp20x_gpio *gpio = pinctrl_dev_get_drvdata(pctldev);\n-\tstruct axp20x_pinctrl_group *g = gpio->groups + group;\n-\tstruct axp20x_pinctrl_function *func = gpio->functions + function;\n+\tstruct axp20x_pctl *pctl = pinctrl_dev_get_drvdata(pctldev);\n+\tstruct axp20x_pinctrl_group *g = pctl->groups + group;\n+\tstruct axp20x_pinctrl_function *func = pctl->functions + function;\n \tstruct axp20x_desc_function *desc_func =\n-\t\taxp20x_pinctrl_desc_find_func_by_name(gpio, g->name,\n+\t\taxp20x_pinctrl_desc_find_func_by_name(pctl, g->name,\n \t\t\t\t\t\t func->name);\n \tif (!desc_func)\n \t\treturn -EINVAL;\n@@ -263,15 +263,15 @@ static int axp20x_pmx_set_mux(struct pinctrl_dev *pctldev,\n }\n \n static struct axp20x_desc_function *\n-axp20x_pctl_desc_find_func_by_pin(struct axp20x_gpio *gpio, unsigned int offset,\n+axp20x_pctl_desc_find_func_by_pin(struct axp20x_pctl *pctl, unsigned int offset,\n \t\t\t\t const char *func)\n {\n \tconst struct axp20x_desc_pin *pin;\n \tstruct axp20x_desc_function *desc_func;\n \tint i;\n \n-\tfor (i = 0; i < gpio->desc->npins; i++) {\n-\t\tpin = &gpio->desc->pins[i];\n+\tfor (i = 0; i < pctl->desc->npins; i++) {\n+\t\tpin = &pctl->desc->pins[i];\n \n \t\tif (pin->pin.number == offset) {\n \t\t\tdesc_func = pin->functions;\n@@ -292,7 +292,7 @@ static int axp20x_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,\n \t\t\t\t\t struct pinctrl_gpio_range *range,\n \t\t\t\t\t unsigned int offset, bool input)\n {\n-\tstruct axp20x_gpio *gpio = pinctrl_dev_get_drvdata(pctldev);\n+\tstruct axp20x_pctl *pctl = pinctrl_dev_get_drvdata(pctldev);\n \tstruct axp20x_desc_function *desc_func;\n \tconst char *func;\n \n@@ -301,7 +301,7 @@ static int axp20x_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,\n \telse\n \t\tfunc = \"gpio_out\";\n \n-\tdesc_func = axp20x_pctl_desc_find_func_by_pin(gpio, offset, func);\n+\tdesc_func = axp20x_pctl_desc_find_func_by_pin(pctl, offset, func);\n \tif (!desc_func)\n \t\treturn -EINVAL;\n \n@@ -319,16 +319,16 @@ static const struct pinmux_ops axp20x_pmx_ops = {\n \n static int axp20x_groups_cnt(struct pinctrl_dev *pctldev)\n {\n-\tstruct axp20x_gpio *gpio = pinctrl_dev_get_drvdata(pctldev);\n+\tstruct axp20x_pctl *pctl = pinctrl_dev_get_drvdata(pctldev);\n \n-\treturn gpio->ngroups;\n+\treturn pctl->ngroups;\n }\n \n static int axp20x_group_pins(struct pinctrl_dev *pctldev, unsigned int selector,\n \t\t\t const unsigned int **pins, unsigned int *num_pins)\n {\n-\tstruct axp20x_gpio *gpio = pinctrl_dev_get_drvdata(pctldev);\n-\tstruct axp20x_pinctrl_group *g = gpio->groups + selector;\n+\tstruct axp20x_pctl *pctl = pinctrl_dev_get_drvdata(pctldev);\n+\tstruct axp20x_pinctrl_group *g = pctl->groups + selector;\n \n \t*pins = (unsigned int *)&g->pin;\n \t*num_pins = 1;\n@@ -339,9 +339,9 @@ static int axp20x_group_pins(struct pinctrl_dev *pctldev, unsigned int selector,\n static const char *axp20x_group_name(struct pinctrl_dev *pctldev,\n \t\t\t\t unsigned int selector)\n {\n-\tstruct axp20x_gpio *gpio = pinctrl_dev_get_drvdata(pctldev);\n+\tstruct axp20x_pctl *pctl = pinctrl_dev_get_drvdata(pctldev);\n \n-\treturn gpio->groups[selector].name;\n+\treturn pctl->groups[selector].name;\n }\n \n static const struct pinctrl_ops axp20x_pctrl_ops = {\n@@ -353,9 +353,9 @@ static const struct pinctrl_ops axp20x_pctrl_ops = {\n };\n \n static struct axp20x_pinctrl_function *\n-axp20x_pinctrl_function_by_name(struct axp20x_gpio *gpio, const char *name)\n+axp20x_pinctrl_function_by_name(struct axp20x_pctl *pctl, const char *name)\n {\n-\tstruct axp20x_pinctrl_function *func = gpio->functions;\n+\tstruct axp20x_pinctrl_function *func = pctl->functions;\n \n \twhile (func->name) {\n \t\tif (!strcmp(func->name, name))\n@@ -366,10 +366,10 @@ axp20x_pinctrl_function_by_name(struct axp20x_gpio *gpio, const char *name)\n \treturn NULL;\n }\n \n-static int axp20x_pinctrl_add_function(struct axp20x_gpio *gpio,\n+static int axp20x_pinctrl_add_function(struct axp20x_pctl *pctl,\n \t\t\t\t const char *name)\n {\n-\tstruct axp20x_pinctrl_function *func = gpio->functions;\n+\tstruct axp20x_pinctrl_function *func = pctl->functions;\n \n \twhile (func->name) {\n \t\tif (!strcmp(func->name, name)) {\n@@ -383,7 +383,7 @@ static int axp20x_pinctrl_add_function(struct axp20x_gpio *gpio,\n \tfunc->name = name;\n \tfunc->ngroups = 1;\n \n-\tgpio->nfunctions++;\n+\tpctl->nfunctions++;\n \n \treturn 0;\n }\n@@ -391,13 +391,13 @@ static int axp20x_pinctrl_add_function(struct axp20x_gpio *gpio,\n static int axp20x_attach_group_function(struct platform_device *pdev,\n \t\t\t\t\tconst struct axp20x_desc_pin *pin)\n {\n-\tstruct axp20x_gpio *gpio = platform_get_drvdata(pdev);\n+\tstruct axp20x_pctl *pctl = platform_get_drvdata(pdev);\n \tstruct axp20x_desc_function *desc_func = pin->functions;\n \tstruct axp20x_pinctrl_function *func;\n \tconst char **func_grp;\n \n \twhile (desc_func->name) {\n-\t\tfunc = axp20x_pinctrl_function_by_name(gpio, desc_func->name);\n+\t\tfunc = axp20x_pinctrl_function_by_name(pctl, desc_func->name);\n \t\tif (!func)\n \t\t\treturn -EINVAL;\n \n@@ -422,48 +422,48 @@ static int axp20x_attach_group_function(struct platform_device *pdev,\n \n static int axp20x_build_state(struct platform_device *pdev)\n {\n-\tstruct axp20x_gpio *gpio = platform_get_drvdata(pdev);\n-\tunsigned int npins = gpio->desc->npins;\n+\tstruct axp20x_pctl *pctl = platform_get_drvdata(pdev);\n+\tunsigned int npins = pctl->desc->npins;\n \tconst struct axp20x_desc_pin *pin;\n \tstruct axp20x_desc_function *func;\n \tint i, ret;\n \n-\tgpio->ngroups = npins;\n-\tgpio->groups = devm_kzalloc(&pdev->dev,\n-\t\t\t\t gpio->ngroups * sizeof(*gpio->groups),\n+\tpctl->ngroups = npins;\n+\tpctl->groups = devm_kzalloc(&pdev->dev,\n+\t\t\t\t pctl->ngroups * sizeof(*pctl->groups),\n \t\t\t\t GFP_KERNEL);\n-\tif (!gpio->groups)\n+\tif (!pctl->groups)\n \t\treturn -ENOMEM;\n \n \tfor (i = 0; i < npins; i++) {\n-\t\tgpio->groups[i].name = gpio->desc->pins[i].pin.name;\n-\t\tgpio->groups[i].pin = gpio->desc->pins[i].pin.number;\n+\t\tpctl->groups[i].name = pctl->desc->pins[i].pin.name;\n+\t\tpctl->groups[i].pin = pctl->desc->pins[i].pin.number;\n \t}\n \n \t/* We assume 4 functions per pin should be enough as a default max */\n-\tgpio->functions = devm_kzalloc(&pdev->dev,\n-\t\t\t\t npins * 4 * sizeof(*gpio->functions),\n+\tpctl->functions = devm_kzalloc(&pdev->dev,\n+\t\t\t\t npins * 4 * sizeof(*pctl->functions),\n \t\t\t\t GFP_KERNEL);\n-\tif (!gpio->functions)\n+\tif (!pctl->functions)\n \t\treturn -ENOMEM;\n \n \t/* Create a list of uniquely named functions */\n \tfor (i = 0; i < npins; i++) {\n-\t\tpin = &gpio->desc->pins[i];\n+\t\tpin = &pctl->desc->pins[i];\n \t\tfunc = pin->functions;\n \n \t\twhile (func->name) {\n-\t\t\taxp20x_pinctrl_add_function(gpio, func->name);\n+\t\t\taxp20x_pinctrl_add_function(pctl, func->name);\n \t\t\tfunc++;\n \t\t}\n \t}\n \n-\tgpio->functions = krealloc(gpio->functions,\n-\t\t\t\t gpio->nfunctions * sizeof(*gpio->functions),\n+\tpctl->functions = krealloc(pctl->functions,\n+\t\t\t\t pctl->nfunctions * sizeof(*pctl->functions),\n \t\t\t\t GFP_KERNEL);\n \n \tfor (i = 0; i < npins; i++) {\n-\t\tpin = &gpio->desc->pins[i];\n+\t\tpin = &pctl->desc->pins[i];\n \t\tret = axp20x_attach_group_function(pdev, pin);\n \t\tif (ret)\n \t\t\treturn ret;\n@@ -472,10 +472,10 @@ static int axp20x_build_state(struct platform_device *pdev)\n \treturn 0;\n }\n \n-static int axp20x_gpio_probe(struct platform_device *pdev)\n+static int axp20x_pctl_probe(struct platform_device *pdev)\n {\n \tstruct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);\n-\tstruct axp20x_gpio *gpio;\n+\tstruct axp20x_pctl *pctl;\n \tstruct pinctrl_desc *pctrl_desc;\n \tstruct pinctrl_pin_desc *pins;\n \tint ret, i;\n@@ -488,42 +488,42 @@ static int axp20x_gpio_probe(struct platform_device *pdev)\n \t\treturn -EINVAL;\n \t}\n \n-\tgpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);\n-\tif (!gpio)\n+\tpctl = devm_kzalloc(&pdev->dev, sizeof(*pctl), GFP_KERNEL);\n+\tif (!pctl)\n \t\treturn -ENOMEM;\n \n-\tgpio->chip.base\t\t\t= -1;\n-\tgpio->chip.can_sleep\t\t= true;\n-\tgpio->chip.request\t\t= gpiochip_generic_request;\n-\tgpio->chip.free\t\t\t= gpiochip_generic_free;\n-\tgpio->chip.parent\t\t= &pdev->dev;\n-\tgpio->chip.label\t\t= dev_name(&pdev->dev);\n-\tgpio->chip.owner\t\t= THIS_MODULE;\n-\tgpio->chip.get\t\t\t= axp20x_gpio_get;\n-\tgpio->chip.get_direction\t= axp20x_gpio_get_direction;\n-\tgpio->chip.set\t\t\t= axp20x_gpio_set;\n-\tgpio->chip.direction_input\t= axp20x_gpio_input;\n-\tgpio->chip.direction_output\t= axp20x_gpio_output;\n-\tgpio->chip.ngpio\t\t= 3;\n+\tpctl->chip.base\t\t\t= -1;\n+\tpctl->chip.can_sleep\t\t= true;\n+\tpctl->chip.request\t\t= gpiochip_generic_request;\n+\tpctl->chip.free\t\t\t= gpiochip_generic_free;\n+\tpctl->chip.parent\t\t= &pdev->dev;\n+\tpctl->chip.label\t\t= dev_name(&pdev->dev);\n+\tpctl->chip.owner\t\t= THIS_MODULE;\n+\tpctl->chip.get\t\t\t= axp20x_gpio_get;\n+\tpctl->chip.get_direction\t= axp20x_gpio_get_direction;\n+\tpctl->chip.set\t\t\t= axp20x_gpio_set;\n+\tpctl->chip.direction_input\t= axp20x_gpio_input;\n+\tpctl->chip.direction_output\t= axp20x_gpio_output;\n+\tpctl->chip.ngpio\t\t= 3;\n \n-\tgpio->regmap = axp20x->regmap;\n+\tpctl->regmap = axp20x->regmap;\n \n-\tgpio->desc = &axp20x_pinctrl_data;\n-\tgpio->dev = &pdev->dev;\n+\tpctl->desc = &axp20x_pinctrl_data;\n+\tpctl->dev = &pdev->dev;\n \n-\tplatform_set_drvdata(pdev, gpio);\n+\tplatform_set_drvdata(pdev, pctl);\n \n \tret = axp20x_build_state(pdev);\n \tif (ret)\n \t\treturn ret;\n \n-\tpins = devm_kzalloc(&pdev->dev, gpio->desc->npins * sizeof(*pins),\n+\tpins = devm_kzalloc(&pdev->dev, pctl->desc->npins * sizeof(*pins),\n \t\t\t GFP_KERNEL);\n \tif (!pins)\n \t\treturn -ENOMEM;\n \n-\tfor (i = 0; i < gpio->desc->npins; i++)\n-\t\tpins[i] = gpio->desc->pins[i].pin;\n+\tfor (i = 0; i < pctl->desc->npins; i++)\n+\t\tpins[i] = pctl->desc->pins[i].pin;\n \n \tpctrl_desc = devm_kzalloc(&pdev->dev, sizeof(*pctrl_desc), GFP_KERNEL);\n \tif (!pctrl_desc)\n@@ -532,26 +532,26 @@ static int axp20x_gpio_probe(struct platform_device *pdev)\n \tpctrl_desc->name = dev_name(&pdev->dev);\n \tpctrl_desc->owner = THIS_MODULE;\n \tpctrl_desc->pins = pins;\n-\tpctrl_desc->npins = gpio->desc->npins;\n+\tpctrl_desc->npins = pctl->desc->npins;\n \tpctrl_desc->pctlops = &axp20x_pctrl_ops;\n \tpctrl_desc->pmxops = &axp20x_pmx_ops;\n \n-\tgpio->pctl_dev = devm_pinctrl_register(&pdev->dev, pctrl_desc, gpio);\n-\tif (IS_ERR(gpio->pctl_dev)) {\n+\tpctl->pctl_dev = devm_pinctrl_register(&pdev->dev, pctrl_desc, pctl);\n+\tif (IS_ERR(pctl->pctl_dev)) {\n \t\tdev_err(&pdev->dev, \"couldn't register pinctrl driver\\n\");\n-\t\treturn PTR_ERR(gpio->pctl_dev);\n+\t\treturn PTR_ERR(pctl->pctl_dev);\n \t}\n \n-\tret = devm_gpiochip_add_data(&pdev->dev, &gpio->chip, gpio);\n+\tret = devm_gpiochip_add_data(&pdev->dev, &pctl->chip, pctl);\n \tif (ret) {\n \t\tdev_err(&pdev->dev, \"Failed to register GPIO chip\\n\");\n \t\treturn ret;\n \t}\n \n-\tret = gpiochip_add_pin_range(&gpio->chip, dev_name(&pdev->dev),\n-\t\t\t\t gpio->desc->pins->pin.number,\n-\t\t\t\t gpio->desc->pins->pin.number,\n-\t\t\t\t gpio->desc->npins);\n+\tret = gpiochip_add_pin_range(&pctl->chip, dev_name(&pdev->dev),\n+\t\t\t\t pctl->desc->pins->pin.number,\n+\t\t\t\t pctl->desc->pins->pin.number,\n+\t\t\t\t pctl->desc->npins);\n \tif (ret) {\n \t\tdev_err(&pdev->dev, \"failed to add pin range\\n\");\n \t\treturn ret;\n@@ -562,21 +562,21 @@ static int axp20x_gpio_probe(struct platform_device *pdev)\n \treturn 0;\n }\n \n-static const struct of_device_id axp20x_gpio_match[] = {\n+static const struct of_device_id axp20x_pctl_match[] = {\n \t{ .compatible = \"x-powers,axp209-gpio\" },\n \t{ }\n };\n-MODULE_DEVICE_TABLE(of, axp20x_gpio_match);\n+MODULE_DEVICE_TABLE(of, axp20x_pctl_match);\n \n-static struct platform_driver axp20x_gpio_driver = {\n-\t.probe\t\t= axp20x_gpio_probe,\n+static struct platform_driver axp20x_pctl_driver = {\n+\t.probe\t\t= axp20x_pctl_probe,\n \t.driver = {\n \t\t.name\t\t= \"axp20x-gpio\",\n-\t\t.of_match_table\t= axp20x_gpio_match,\n+\t\t.of_match_table\t= axp20x_pctl_match,\n \t},\n };\n \n-module_platform_driver(axp20x_gpio_driver);\n+module_platform_driver(axp20x_pctl_driver);\n \n MODULE_AUTHOR(\"Maxime Ripard <maxime.ripard@free-electrons.com>\");\n MODULE_AUTHOR(\"Quentin Schulz <quentin.schulz@free-electrons.com>\");\n", "prefixes": [ "v2", "04/10" ] }