redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

gpio: stp-xway: simplify error handling in xway_stp_probe() 

Return early if devm_gpiochip_add_data() returns an error instead of
having two consecutive "if (!ret) ..." statements.

Also make xway_stp_hw_init() return void because it unconditionally
returns 0. While here also update the kerneldoc comment for
xway_stp_hw_init().

These changes makes the error handling within the driver consistent.
No functional changes intended.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/20190702223248.31934-2-martin.blumenstingl@googlemail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
alistair/sunxi64-5.4-dsi
Martin Blumenstingl 2019-07-03 00:32:45 +02:00 committed by Linus Walleij
parent 827a9b8bbf
commit 8a7b179781
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpio/gpio-stp-xway.c
View File

@ -159,9 +159,9 @@ static int xway_stp_request(struct gpio_chip *gc, unsigned gpio)
/**
* xway_stp_hw_init() - Configure the STP unit and enable the clock gate
* @virt: pointer to the remapped register range
* @chip: Pointer to the xway_stp chip structure
*/
static int xway_stp_hw_init(struct xway_stp *chip)
static void xway_stp_hw_init(struct xway_stp *chip)
{
/* sane defaults */
xway_stp_w32(chip->virt, 0, XWAY_STP_AR);
@ -204,8 +204,6 @@ static int xway_stp_hw_init(struct xway_stp *chip)
if (chip->reserved)
xway_stp_w32_mask(chip->virt, XWAY_STP_UPD_MASK,
XWAY_STP_UPD_FPI, XWAY_STP_CON1);
return 0;
}
static int xway_stp_probe(struct platform_device *pdev)
@ -268,14 +266,15 @@ static int xway_stp_probe(struct platform_device *pdev)
}
clk_enable(clk);
ret = xway_stp_hw_init(chip);
if (!ret)
ret = devm_gpiochip_add_data(&pdev->dev, &chip->gc, chip);
xway_stp_hw_init(chip);
if (!ret)
dev_info(&pdev->dev, "Init done\n");
ret = devm_gpiochip_add_data(&pdev->dev, &chip->gc, chip);
if (ret)
return ret;
return ret;
dev_info(&pdev->dev, "Init done\n");
return 0;
}
static const struct of_device_id xway_stp_match[] = {