Revert "gpio: rcar: Fine-grained Runtime PM support" (ce0e2c60) · Commits · e / devices / android_kernel_teracube_2e

drivers/gpio/gpio-rcar.c

+6 −17

Original line number	Diff line number	Diff line
		@@ -242,32 +242,18 @@ static void gpio_rcar_config_general_input_output_mode(struct gpio_chip *chip,

		static int gpio_rcar_request(struct gpio_chip *chip, unsigned offset)
		{
		struct gpio_rcar_priv *p = gpiochip_get_data(chip);
		int error;

		error = pm_runtime_get_sync(&p->pdev->dev);
		if (error < 0)
		return error;

		error = pinctrl_request_gpio(chip->base + offset);
		if (error)
		pm_runtime_put(&p->pdev->dev);

		return error;
		return pinctrl_request_gpio(chip->base + offset);
		}

		static void gpio_rcar_free(struct gpio_chip *chip, unsigned offset)
		{
		struct gpio_rcar_priv *p = gpiochip_get_data(chip);

		pinctrl_free_gpio(chip->base + offset);

		/* Set the GPIO as an input to ensure that the next GPIO request won't
		/*
		* Set the GPIO as an input to ensure that the next GPIO request won't
		* drive the GPIO pin as an output.
		*/
		gpio_rcar_config_general_input_output_mode(chip, offset, false);

		pm_runtime_put(&p->pdev->dev);
		}

		static int gpio_rcar_direction_input(struct gpio_chip *chip, unsigned offset)
		@@ -414,6 +400,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
		}

		pm_runtime_enable(dev);
		pm_runtime_get_sync(dev);

		io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
		@@ -480,6 +467,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
		err1:
		gpiochip_remove(gpio_chip);
		err0:
		pm_runtime_put(dev);
		pm_runtime_disable(dev);
		return ret;
		}
		@@ -490,6 +478,7 @@ static int gpio_rcar_remove(struct platform_device *pdev)

		gpiochip_remove(&p->gpio_chip);

		pm_runtime_put(&pdev->dev);
		pm_runtime_disable(&pdev->dev);
		return 0;
		}