Hi,
Series contains few cleanups for pinctr-at91-pio4 driver.
Thank you,
Claudiu Beznea
Claudiu Beznea (4):
pinctrl: at91-pio4: use devm_clk_get_enabled()
pinctrl: at91-pio4: use device_get_match_data()
pinctrl: at91-pio4: use dev_err_probe()
pinctrl: at91-pio4: use proper format specifier for unsigned int
drivers/pinctrl/pinctrl-at91-pio4.c | 42 +++++++++--------------------
1 file changed, 13 insertions(+), 29 deletions(-)
--
2.34.1
Use devm_clk_get_enabled() to simplify the code.
Signed-off-by: Claudiu Beznea <[email protected]>
---
drivers/pinctrl/pinctrl-at91-pio4.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 39b233f73e13..0aceb723f94c 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -1098,7 +1098,7 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
if (IS_ERR(atmel_pioctrl->reg_base))
return PTR_ERR(atmel_pioctrl->reg_base);
- atmel_pioctrl->clk = devm_clk_get(dev, NULL);
+ atmel_pioctrl->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(atmel_pioctrl->clk)) {
dev_err(dev, "failed to get clock\n");
return PTR_ERR(atmel_pioctrl->clk);
@@ -1219,25 +1219,19 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
i, irq);
}
- ret = clk_prepare_enable(atmel_pioctrl->clk);
- if (ret) {
- dev_err(dev, "failed to prepare and enable clock\n");
- goto clk_prepare_enable_error;
- }
-
atmel_pioctrl->pinctrl_dev = devm_pinctrl_register(&pdev->dev,
&atmel_pinctrl_desc,
atmel_pioctrl);
if (IS_ERR(atmel_pioctrl->pinctrl_dev)) {
ret = PTR_ERR(atmel_pioctrl->pinctrl_dev);
dev_err(dev, "pinctrl registration failed\n");
- goto clk_unprep;
+ goto irq_domain_remove_error;
}
ret = gpiochip_add_data(atmel_pioctrl->gpio_chip, atmel_pioctrl);
if (ret) {
dev_err(dev, "failed to add gpiochip\n");
- goto clk_unprep;
+ goto irq_domain_remove_error;
}
ret = gpiochip_add_pin_range(atmel_pioctrl->gpio_chip, dev_name(dev),
@@ -1254,10 +1248,7 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
gpiochip_add_pin_range_error:
gpiochip_remove(atmel_pioctrl->gpio_chip);
-clk_unprep:
- clk_disable_unprepare(atmel_pioctrl->clk);
-
-clk_prepare_enable_error:
+irq_domain_remove_error:
irq_domain_remove(atmel_pioctrl->irq_domain);
return ret;
--
2.34.1
Use device_get_match_data() to simplify the code.
Signed-off-by: Claudiu Beznea <[email protected]>
---
drivers/pinctrl/pinctrl-at91-pio4.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 0aceb723f94c..93023d0fd75b 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -1067,7 +1067,6 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct pinctrl_pin_desc *pin_desc;
const char **group_names;
- const struct of_device_id *match;
int i, ret;
struct atmel_pioctrl *atmel_pioctrl;
const struct atmel_pioctrl_data *atmel_pioctrl_data;
@@ -1079,12 +1078,11 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
atmel_pioctrl->node = dev->of_node;
platform_set_drvdata(pdev, atmel_pioctrl);
- match = of_match_node(atmel_pctrl_of_match, dev->of_node);
- if (!match) {
- dev_err(dev, "unknown compatible string\n");
+ atmel_pioctrl_data = device_get_match_data(dev);
+ if (!atmel_pioctrl_data) {
+ dev_err(dev, "Invalid device data\n");
return -ENODEV;
}
- atmel_pioctrl_data = match->data;
atmel_pioctrl->nbanks = atmel_pioctrl_data->nbanks;
atmel_pioctrl->npins = atmel_pioctrl->nbanks * ATMEL_PIO_NPINS_PER_BANK;
/* if last bank has limited number of pins, adjust accordingly */
--
2.34.1
Use dev_err_probe() to simplify the code.
Signed-off-by: Claudiu Beznea <[email protected]>
---
drivers/pinctrl/pinctrl-at91-pio4.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 93023d0fd75b..783968182bc7 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -1079,10 +1079,9 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, atmel_pioctrl);
atmel_pioctrl_data = device_get_match_data(dev);
- if (!atmel_pioctrl_data) {
- dev_err(dev, "Invalid device data\n");
- return -ENODEV;
- }
+ if (!atmel_pioctrl_data)
+ return dev_err_probe(dev, -ENODEV, "Invalid device data\n");
+
atmel_pioctrl->nbanks = atmel_pioctrl_data->nbanks;
atmel_pioctrl->npins = atmel_pioctrl->nbanks * ATMEL_PIO_NPINS_PER_BANK;
/* if last bank has limited number of pins, adjust accordingly */
@@ -1097,10 +1096,8 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
return PTR_ERR(atmel_pioctrl->reg_base);
atmel_pioctrl->clk = devm_clk_get_enabled(dev, NULL);
- if (IS_ERR(atmel_pioctrl->clk)) {
- dev_err(dev, "failed to get clock\n");
- return PTR_ERR(atmel_pioctrl->clk);
- }
+ if (IS_ERR(atmel_pioctrl->clk))
+ return dev_err_probe(dev, PTR_ERR(atmel_pioctrl->clk), "failed to get clock\n");
atmel_pioctrl->pins = devm_kcalloc(dev,
atmel_pioctrl->npins,
@@ -1200,10 +1197,8 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
atmel_pioctrl->irq_domain = irq_domain_add_linear(dev->of_node,
atmel_pioctrl->gpio_chip->ngpio,
&irq_domain_simple_ops, NULL);
- if (!atmel_pioctrl->irq_domain) {
- dev_err(dev, "can't add the irq domain\n");
- return -ENODEV;
- }
+ if (!atmel_pioctrl->irq_domain)
+ return dev_err_probe(dev, -ENODEV, "can't add the irq domain\n");
atmel_pioctrl->irq_domain->name = "atmel gpio";
for (i = 0; i < atmel_pioctrl->npins; i++) {
--
2.34.1
Use %u instead of %d as line is unsigned int.
Signed-off-by: Claudiu Beznea <[email protected]>
---
drivers/pinctrl/pinctrl-at91-pio4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 783968182bc7..d6426367594e 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -1144,7 +1144,7 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
pin_desc[i].number = i;
/* Pin naming convention: P(bank_name)(bank_pin_number). */
- pin_desc[i].name = kasprintf(GFP_KERNEL, "P%c%d",
+ pin_desc[i].name = kasprintf(GFP_KERNEL, "P%c%u",
bank + 'A', line);
group->name = group_names[i] = pin_desc[i].name;
--
2.34.1
On Thu, Mar 2, 2023 at 12:01 PM Claudiu Beznea
<[email protected]> wrote:
> Series contains few cleanups for pinctr-at91-pio4 driver.
Patches applied, thank you Caludiu!
I had to manually rebase patch 4 so check the result.
Yours,
Linus Walleij
On 07.03.2023 15:14, Linus Walleij wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> On Thu, Mar 2, 2023 at 12:01 PM Claudiu Beznea
> <[email protected]> wrote:
>
>> Series contains few cleanups for pinctr-at91-pio4 driver.
>
> Patches applied, thank you Caludiu!
> I had to manually rebase patch 4 so check the result.
Looks good! Thank you, Linus!
Claudiu
>
> Yours,
> Linus Walleij