Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / drivers / usb / host / ohci-platform.c

diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index 61fe2b9..1e6c954 100644 (file)
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generic platform ohci driver
  *
@@ -11,8 +12,6 @@
  * Copyright 2000-2002 David Brownell
  * Copyright 1999 Linus Torvalds
  * Copyright 1999 Gregory P. Smith
- *
- * Licensed under the GNU/GPL. See COPYING for details.
  */
 
 #include <linux/clk.h>
@@ -34,12 +33,11 @@
 
 #define DRIVER_DESC "OHCI generic platform driver"
 #define OHCI_MAX_CLKS 3
-#define OHCI_MAX_RESETS 2
 #define hcd_to_ohci_priv(h) ((struct ohci_platform_priv *)hcd_to_ohci(h)->priv)
 
 struct ohci_platform_priv {
        struct clk *clks[OHCI_MAX_CLKS];
-       struct reset_control *resets[OHCI_MAX_RESETS];
+       struct reset_control *resets;
        struct phy **phys;
        int num_phys;
 };
@@ -119,7 +117,7 @@ static int ohci_platform_probe(struct platform_device *dev)
        struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
        struct ohci_platform_priv *priv;
        struct ohci_hcd *ohci;
-       int err, irq, phy_num, clk = 0, rst = 0;
+       int err, irq, phy_num, clk = 0;
 
        if (usb_disabled())
                return -ENODEV;
@@ -204,21 +202,17 @@ static int ohci_platform_probe(struct platform_device *dev)
                                break;
                        }
                }
-               for (rst = 0; rst < OHCI_MAX_RESETS; rst++) {
-                       priv->resets[rst] =
-                               devm_reset_control_get_shared_by_index(
-                                                               &dev->dev, rst);
-                       if (IS_ERR(priv->resets[rst])) {
-                               err = PTR_ERR(priv->resets[rst]);
-                               if (err == -EPROBE_DEFER)
-                                       goto err_reset;
-                               priv->resets[rst] = NULL;
-                               break;
-                       }
-                       err = reset_control_deassert(priv->resets[rst]);
-                       if (err)
-                               goto err_reset;
+
+               priv->resets = devm_reset_control_array_get_optional_shared(
+                                                               &dev->dev);
+               if (IS_ERR(priv->resets)) {
+                       err = PTR_ERR(priv->resets);
+                       goto err_put_clks;
                }
+
+               err = reset_control_deassert(priv->resets);
+               if (err)
+                       goto err_put_clks;
        }
 
        if (pdata->big_endian_desc)
@@ -279,8 +273,7 @@ err_power:
                pdata->power_off(dev);
 err_reset:
        pm_runtime_disable(&dev->dev);
-       while (--rst >= 0)
-               reset_control_assert(priv->resets[rst]);
+       reset_control_assert(priv->resets);
 err_put_clks:
        while (--clk >= 0)
                clk_put(priv->clks[clk]);
@@ -298,7 +291,7 @@ static int ohci_platform_remove(struct platform_device *dev)
        struct usb_hcd *hcd = platform_get_drvdata(dev);
        struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
        struct ohci_platform_priv *priv = hcd_to_ohci_priv(hcd);
-       int clk, rst;
+       int clk;
 
        pm_runtime_get_sync(&dev->dev);
        usb_remove_hcd(hcd);
@@ -306,8 +299,7 @@ static int ohci_platform_remove(struct platform_device *dev)
        if (pdata->power_off)
                pdata->power_off(dev);
 
-       for (rst = 0; rst < OHCI_MAX_RESETS && priv->resets[rst]; rst++)
-               reset_control_assert(priv->resets[rst]);
+       reset_control_assert(priv->resets);
 
        for (clk = 0; clk < OHCI_MAX_CLKS && priv->clks[clk]; clk++)
                clk_put(priv->clks[clk]);