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

Commit 99357127 authored by Fabio Estevam's avatar Fabio Estevam Committed by Linus Walleij
Browse files

gpio: gpio-mxs: Remove unneeded dt checks 



mxs is a devicetree only platform, so there is no need to check whether we
are in dt or platform data case.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8a242842

drivers/gpio/gpio-mxs.c

+9 −23
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ static int mxs_gpio_probe(struct platform_device *pdev) 
	struct device_node *parent;

	static void __iomem *base;

	struct mxs_gpio_port *port;

	struct resource *iores = NULL;

	int irq_base;

	int err;
@@ -262,16 +261,10 @@ static int mxs_gpio_probe(struct platform_device *pdev) 
	if (!port)

		return -ENOMEM;



	if (np) {

	port->id = of_alias_get_id(np, "gpio");

	if (port->id < 0)

		return port->id;

	port->devid = (enum mxs_gpio_id) of_id->data;

	} else {

		port->id = pdev->id;

		port->devid = pdev->id_entry->driver_data;

	}



	port->irq = platform_get_irq(pdev, 0);

	if (port->irq < 0)

		return port->irq;
@@ -281,18 +274,11 @@ static int mxs_gpio_probe(struct platform_device *pdev) 
	 * share the same one

	 */

	if (!base) {

		if (np) {

		parent = of_get_parent(np);

		base = of_iomap(parent, 0);

		of_node_put(parent);

		if (!base)

			return -EADDRNOTAVAIL;

		} else {

			iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);

			base = devm_ioremap_resource(&pdev->dev, iores);

			if (IS_ERR(base))

				return PTR_ERR(base);

		}

	}

	port->base = base;