Make UART4 the default UART for kernel messages

[linux-beck.git] / drivers / memory / omap-gpmc.c

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index f00f3e7422657723ad8f69bd90f76554f8938bb6..5457c361ad586424050c98958bdefd22a4c17db7 100644 (file)
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -350,8 +350,8 @@ static unsigned int gpmc_ps_to_ticks(unsigned int time_ps)
        return (time_ps + tick_ps - 1) / tick_ps;
 }
 
-unsigned int gpmc_clk_ticks_to_ns(unsigned ticks, int cs,
-                                 enum gpmc_clk_domain cd)
+static unsigned int gpmc_clk_ticks_to_ns(unsigned int ticks, int cs,
+                                        enum gpmc_clk_domain cd)
 {
        return ticks * gpmc_get_clk_period(cs, cd) / 1000;
 }
@@ -2143,9 +2143,7 @@ err_child_fail:
        ret = -ENODEV;
 
 err_cs:
-       if (waitpin_desc)
-               gpiochip_free_own_desc(waitpin_desc);
-
+       gpiochip_free_own_desc(waitpin_desc);
 err:
        gpmc_cs_free(cs);
 
@@ -2265,7 +2263,7 @@ static int gpmc_gpio_init(struct gpmc_device *gpmc)
        gpmc->gpio_chip.get = gpmc_gpio_get;
        gpmc->gpio_chip.base = -1;
 
-       ret = gpiochip_add(&gpmc->gpio_chip);
+       ret = devm_gpiochip_add_data(gpmc->dev, &gpmc->gpio_chip, NULL);
        if (ret < 0) {
                dev_err(gpmc->dev, "could not register gpio chip: %d\n", ret);
                return ret;
@@ -2274,11 +2272,6 @@ static int gpmc_gpio_init(struct gpmc_device *gpmc)
        return 0;
 }
 
-static void gpmc_gpio_exit(struct gpmc_device *gpmc)
-{
-       gpiochip_remove(&gpmc->gpio_chip);
-}
-
 static int gpmc_probe(struct platform_device *pdev)
 {
        int rc;
@@ -2365,15 +2358,13 @@ static int gpmc_probe(struct platform_device *pdev)
        rc = gpmc_setup_irq(gpmc);
        if (rc) {
                dev_err(gpmc->dev, "gpmc_setup_irq failed\n");
-               goto setup_irq_failed;
+               goto gpio_init_failed;
        }
 
        gpmc_probe_dt_children(pdev);
 
        return 0;
 
-setup_irq_failed:
-       gpmc_gpio_exit(gpmc);
 gpio_init_failed:
        gpmc_mem_exit();
        pm_runtime_put_sync(&pdev->dev);
@@ -2387,7 +2378,6 @@ static int gpmc_remove(struct platform_device *pdev)
        struct gpmc_device *gpmc = platform_get_drvdata(pdev);
 
        gpmc_free_irq(gpmc);
-       gpmc_gpio_exit(gpmc);
        gpmc_mem_exit();
        pm_runtime_put_sync(&pdev->dev);
        pm_runtime_disable(&pdev->dev);