Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 602d38bc authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Bjorn Helgaas
Browse files

PCI: dra7xx: Simplify probe code with devm_gpiod_get_optional() 



No functional change.  Use the new devm_gpiod_get_optional() to simplify
the probe code.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 950bf638

drivers/pci/dwc/pci-dra7xx.c

+5 −16
Original line number Diff line number Diff line
@@ -320,9 +320,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	char name[10];

	int gpio_sel;

	enum of_gpio_flags flags;

	unsigned long gpio_flags;

	struct gpio_desc *reset;



	dra7xx = devm_kzalloc(dev, sizeof(*dra7xx), GFP_KERNEL);

	if (!dra7xx)
@@ -388,19 +386,10 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 
		goto err_get_sync;

	}



	gpio_sel = of_get_gpio_flags(dev->of_node, 0, &flags);

	if (gpio_is_valid(gpio_sel)) {

		gpio_flags = (flags & OF_GPIO_ACTIVE_LOW) ?

				GPIOF_OUT_INIT_LOW : GPIOF_OUT_INIT_HIGH;

		ret = devm_gpio_request_one(dev, gpio_sel, gpio_flags,

					    "pcie_reset");

		if (ret) {

			dev_err(dev, "gpio%d request failed, ret %d\n",

				gpio_sel, ret);

			goto err_gpio;

		}

	} else if (gpio_sel == -EPROBE_DEFER) {

		ret = -EPROBE_DEFER;

	reset = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);

	if (IS_ERR(reset)) {

		ret = PTR_ERR(reset);

		dev_err(&pdev->dev, "gpio request failed, ret %d\n", ret);

		goto err_gpio;

	}