Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fb02404 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files

usb: host: xhci-rcar: remove leftover quirk handling 



[ Upstream commit 5d67f4861884762ebc2bddb5d667444e45f25782 ]

Loading V3 firmware does not need a quirk anymore, remove the leftover
code.

Fixes: ed8603e1 ("usb: host: xhci-rcar: Simplify getting the firmware name for R-Car Gen3")
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20230307163041.3815-10-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 36fb7843

drivers/usb/host/xhci-rcar.c

+0 −3
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3); 


/* For soc_device_attribute */

#define RCAR_XHCI_FIRMWARE_V2   BIT(0) /* FIRMWARE V2 */

#define RCAR_XHCI_FIRMWARE_V3   BIT(1) /* FIRMWARE V3 */



static const struct soc_device_attribute rcar_quirks_match[]  = {

	{
@@ -147,8 +146,6 @@ static int xhci_rcar_download_firmware(struct usb_hcd *hcd) 


	if (quirks & RCAR_XHCI_FIRMWARE_V2)

		firmware_name = XHCI_RCAR_FIRMWARE_NAME_V2;

	else if (quirks & RCAR_XHCI_FIRMWARE_V3)

		firmware_name = XHCI_RCAR_FIRMWARE_NAME_V3;

	else

		firmware_name = priv->firmware_name;