usb: host: xhci-rcar: Remove SET_XHCI_PLAT_PRIV_FOR_RCAR() macro

The SET_XHCI_PLAT_PRIV_FOR_RCAR() macro does not add much value (there
are only two users), and stands in the way of handling differences
between R-Car Gen2 and Gen3.  Remove it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patch.msgid.link/a7083c3c822837556b91d845bd449c099db64769.1780499433.git.geert+renesas@glider.be
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 8a993ee21c879bfbfe4daf938f1c04488132e6fa..d2efc98090ce0053692f9e8711da519083e8e22e 100644 (file)
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -213,19 +213,20 @@ static int xhci_rcar_resume_quirk(struct usb_hcd *hcd)
  * long delay for the handshake of STS_HALT is neeed in xhci_suspend()
  * by using the XHCI_SLOW_SUSPEND quirk.
  */
-#define SET_XHCI_PLAT_PRIV_FOR_RCAR(firmware)                          \
-       .firmware_name = firmware,                                      \
-       .quirks = XHCI_NO_64BIT_SUPPORT |  XHCI_SLOW_SUSPEND,           \
-       .init_quirk = xhci_rcar_init_quirk,                             \
-       .plat_start = xhci_rcar_start,                                  \
-       .resume_quirk = xhci_rcar_resume_quirk,
-
 static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen2 = {
-       SET_XHCI_PLAT_PRIV_FOR_RCAR(XHCI_RCAR_FIRMWARE_NAME_V1)
+       .firmware_name = XHCI_RCAR_FIRMWARE_NAME_V1,
+       .quirks = XHCI_NO_64BIT_SUPPORT |  XHCI_SLOW_SUSPEND,
+       .init_quirk = xhci_rcar_init_quirk,
+       .plat_start = xhci_rcar_start,
+       .resume_quirk = xhci_rcar_resume_quirk,
 };
 
 static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen3 = {
-       SET_XHCI_PLAT_PRIV_FOR_RCAR(XHCI_RCAR_FIRMWARE_NAME_V3)
+       .firmware_name = XHCI_RCAR_FIRMWARE_NAME_V3,
+       .quirks = XHCI_NO_64BIT_SUPPORT |  XHCI_SLOW_SUSPEND,
+       .init_quirk = xhci_rcar_init_quirk,
+       .plat_start = xhci_rcar_start,
+       .resume_quirk = xhci_rcar_resume_quirk,
 };
 
 static const struct xhci_plat_priv xhci_plat_renesas_rzv2m = {