Commit bf2ae389 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Dmitry Torokhov
Browse files

Input: goodix - simplify with dev_err_probe() 



Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and also it prints the error value.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230625162817.100397-14-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e89f0de5

drivers/input/touchscreen/goodix.c

+11 −29
Original line number Diff line number Diff line
@@ -927,7 +927,6 @@ static int goodix_add_acpi_gpio_mappings(struct goodix_ts_data *ts) 
 */

static int goodix_get_gpio_config(struct goodix_ts_data *ts)

{

	int error;

	struct device *dev;

	struct gpio_desc *gpiod;

	bool added_acpi_mappings = false;
@@ -943,33 +942,20 @@ static int goodix_get_gpio_config(struct goodix_ts_data *ts) 
	ts->gpiod_rst_flags = GPIOD_IN;



	ts->avdd28 = devm_regulator_get(dev, "AVDD28");

	if (IS_ERR(ts->avdd28)) {

		error = PTR_ERR(ts->avdd28);

		if (error != -EPROBE_DEFER)

			dev_err(dev,

				"Failed to get AVDD28 regulator: %d\n", error);

		return error;

	}

	if (IS_ERR(ts->avdd28))

		return dev_err_probe(dev, PTR_ERR(ts->avdd28), "Failed to get AVDD28 regulator\n");



	ts->vddio = devm_regulator_get(dev, "VDDIO");

	if (IS_ERR(ts->vddio)) {

		error = PTR_ERR(ts->vddio);

		if (error != -EPROBE_DEFER)

			dev_err(dev,

				"Failed to get VDDIO regulator: %d\n", error);

		return error;

	}

	if (IS_ERR(ts->vddio))

		return dev_err_probe(dev, PTR_ERR(ts->vddio), "Failed to get VDDIO regulator\n");



retry_get_irq_gpio:

	/* Get the interrupt GPIO pin number */

	gpiod = devm_gpiod_get_optional(dev, GOODIX_GPIO_INT_NAME, GPIOD_IN);

	if (IS_ERR(gpiod)) {

		error = PTR_ERR(gpiod);

		if (error != -EPROBE_DEFER)

			dev_err(dev, "Failed to get %s GPIO: %d\n",

				GOODIX_GPIO_INT_NAME, error);

		return error;

	}

	if (IS_ERR(gpiod))

		return dev_err_probe(dev, PTR_ERR(gpiod), "Failed to get %s GPIO\n",

				     GOODIX_GPIO_INT_NAME);



	if (!gpiod && has_acpi_companion(dev) && !added_acpi_mappings) {

		added_acpi_mappings = true;

		if (goodix_add_acpi_gpio_mappings(ts) == 0)
@@ -980,13 +966,9 @@ static int goodix_get_gpio_config(struct goodix_ts_data *ts) 


	/* Get the reset line GPIO pin number */

	gpiod = devm_gpiod_get_optional(dev, GOODIX_GPIO_RST_NAME, ts->gpiod_rst_flags);

	if (IS_ERR(gpiod)) {

		error = PTR_ERR(gpiod);

		if (error != -EPROBE_DEFER)

			dev_err(dev, "Failed to get %s GPIO: %d\n",

				GOODIX_GPIO_RST_NAME, error);

		return error;

	}

	if (IS_ERR(gpiod))

		return dev_err_probe(dev, PTR_ERR(gpiod), "Failed to get %s GPIO\n",

				     GOODIX_GPIO_RST_NAME);



	ts->gpiod_rst = gpiod;