usb: host: xhci: plat: finally get rid of xhci_plat_type_is()

Now that there are no more users for
xhci_plat_type_is(), we can safely remove it.

Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 9e84992805d6b60ce1b19433e4e2dde0f26889a4..676ea458148b8e87631c317b0356a381ccc04e31 100644 (file)
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -86,19 +86,16 @@ static int xhci_plat_start(struct usb_hcd *hcd)
 
 #ifdef CONFIG_OF
 static const struct xhci_plat_priv xhci_plat_marvell_armada = {
-       .type = XHCI_PLAT_TYPE_MARVELL_ARMADA,
        .init_quirk = xhci_mvebu_mbus_init_quirk,
 };
 
 static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen2 = {
-       .type = XHCI_PLAT_TYPE_RENESAS_RCAR_GEN2,
        .firmware_name = XHCI_RCAR_FIRMWARE_NAME_V1,
        .init_quirk = xhci_rcar_init_quirk,
        .plat_start = xhci_rcar_start,
 };
 
 static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen3 = {
-       .type = XHCI_PLAT_TYPE_RENESAS_RCAR_GEN3,
        .firmware_name = XHCI_RCAR_FIRMWARE_NAME_V2,
        .init_quirk = xhci_rcar_init_quirk,
        .plat_start = xhci_rcar_start,

diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h
index 3cc9b2208683aca2af021835acf1b131279fb513..9af0cb48053f27bd07cd3ad1d79b3a6815700fa4 100644 (file)
--- a/drivers/usb/host/xhci-plat.h
+++ b/drivers/usb/host/xhci-plat.h
@@ -13,29 +13,11 @@
 
 #include "xhci.h"      /* for hcd_to_xhci() */
 
-enum xhci_plat_type {
-       XHCI_PLAT_TYPE_MARVELL_ARMADA = 1,
-       XHCI_PLAT_TYPE_RENESAS_RCAR_GEN2,
-       XHCI_PLAT_TYPE_RENESAS_RCAR_GEN3,
-};
-
 struct xhci_plat_priv {
-       enum xhci_plat_type type;
        const char *firmware_name;
        void (*plat_start)(struct usb_hcd *);
        int (*init_quirk)(struct usb_hcd *);
 };
 
 #define hcd_to_xhci_priv(h) ((struct xhci_plat_priv *)hcd_to_xhci(h)->priv)
-
-static inline bool xhci_plat_type_is(struct usb_hcd *hcd,
-                                    enum xhci_plat_type type)
-{
-       struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
-
-       if (priv && priv->type == type)
-               return true;
-       else
-               return false;
-}
 #endif /* _XHCI_PLAT_H */