Skip to content

Commit

Permalink
pinctrl: at91-pio4: use dev_err_probe()
Browse files Browse the repository at this point in the history
Use dev_err_probe() to simplify the code.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20230302110116.342486-4-claudiu.beznea@microchip.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Claudiu Beznea authored and Linus Walleij committed Mar 7, 2023
1 parent 1ffd07c commit f03fff5
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions drivers/pinctrl/pinctrl-at91-pio4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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,
Expand Down Expand Up @@ -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++) {
Expand Down

0 comments on commit f03fff5

Please sign in to comment.