From: Christoph Hellwig <hch@lst.de>
To: Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>, Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org,
devicetree@vger.kernel.org, linux-arch@vger.kernel.org,
dmaengine@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-renesas-soc@vger.kernel.org, linux-i2c@vger.kernel.org,
linux-input@vger.kernel.org, linux-media@vger.kernel.org,
linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org,
netdev@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-rtc@vger.kernel.org, linux-spi@vger.kernel.org,
linux-serial@vger.kernel.org, linux-usb@vger.kernel.org,
linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org,
linux-sh@vger.kernel.org
Subject: [PATCH 18/22] usb: remove ehci-sh
Date: Fri, 13 Jan 2023 07:23:35 +0100 [thread overview]
Message-ID: <20230113062339.1909087-19-hch@lst.de> (raw)
In-Reply-To: <20230113062339.1909087-1-hch@lst.de>
Now that arch/sh is removed this driver is dead code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/usb/host/Kconfig | 7 --
drivers/usb/host/ehci-hcd.c | 7 --
drivers/usb/host/ehci-sh.c | 182 ------------------------------------
3 files changed, 196 deletions(-)
delete mode 100644 drivers/usb/host/ehci-sh.c
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index ca5f657c092cf4..ddd8b798626caf 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -279,13 +279,6 @@ config USB_EHCI_HCD_PPC_OF
Enables support for the USB controller present on the PowerPC
OpenFirmware platform bus.
-config USB_EHCI_SH
- bool "EHCI support for SuperH USB controller"
- depends on SUPERH || COMPILE_TEST
- help
- Enables support for the on-chip EHCI controller on the SuperH.
- If you use the PCI EHCI controller, this option is not necessary.
-
config USB_EHCI_EXYNOS
tristate "EHCI support for Samsung S5P/Exynos SoC Series"
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index a1930db0da1c3c..e6dfef3492aabe 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1309,10 +1309,6 @@ MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR (DRIVER_AUTHOR);
MODULE_LICENSE ("GPL");
-#ifdef CONFIG_USB_EHCI_SH
-#include "ehci-sh.c"
-#endif
-
#ifdef CONFIG_PPC_PS3
#include "ehci-ps3.c"
#endif
@@ -1330,9 +1326,6 @@ MODULE_LICENSE ("GPL");
#endif
static struct platform_driver * const platform_drivers[] = {
-#ifdef CONFIG_USB_EHCI_SH
- &ehci_hcd_sh_driver,
-#endif
#ifdef CONFIG_USB_EHCI_HCD_PPC_OF
&ehci_hcd_ppc_of_driver,
#endif
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c
deleted file mode 100644
index c25c51d26f2603..00000000000000
--- a/drivers/usb/host/ehci-sh.c
+++ /dev/null
@@ -1,182 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * SuperH EHCI host controller driver
- *
- * Copyright (C) 2010 Paul Mundt
- *
- * Based on ohci-sh.c and ehci-atmel.c.
- */
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-
-struct ehci_sh_priv {
- struct clk *iclk, *fclk;
- struct usb_hcd *hcd;
-};
-
-static int ehci_sh_reset(struct usb_hcd *hcd)
-{
- struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-
- ehci->caps = hcd->regs;
-
- return ehci_setup(hcd);
-}
-
-static const struct hc_driver ehci_sh_hc_driver = {
- .description = hcd_name,
- .product_desc = "SuperH EHCI",
- .hcd_priv_size = sizeof(struct ehci_hcd),
-
- /*
- * generic hardware linkage
- */
- .irq = ehci_irq,
- .flags = HCD_USB2 | HCD_DMA | HCD_MEMORY | HCD_BH,
-
- /*
- * basic lifecycle operations
- */
- .reset = ehci_sh_reset,
- .start = ehci_run,
- .stop = ehci_stop,
- .shutdown = ehci_shutdown,
-
- /*
- * managing i/o requests and associated device resources
- */
- .urb_enqueue = ehci_urb_enqueue,
- .urb_dequeue = ehci_urb_dequeue,
- .endpoint_disable = ehci_endpoint_disable,
- .endpoint_reset = ehci_endpoint_reset,
-
- /*
- * scheduling support
- */
- .get_frame_number = ehci_get_frame,
-
- /*
- * root hub support
- */
- .hub_status_data = ehci_hub_status_data,
- .hub_control = ehci_hub_control,
-
-#ifdef CONFIG_PM
- .bus_suspend = ehci_bus_suspend,
- .bus_resume = ehci_bus_resume,
-#endif
-
- .relinquish_port = ehci_relinquish_port,
- .port_handed_over = ehci_port_handed_over,
- .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
-};
-
-static int ehci_hcd_sh_probe(struct platform_device *pdev)
-{
- struct resource *res;
- struct ehci_sh_priv *priv;
- struct usb_hcd *hcd;
- int irq, ret;
-
- if (usb_disabled())
- return -ENODEV;
-
- irq = platform_get_irq(pdev, 0);
- if (irq <= 0) {
- ret = -ENODEV;
- goto fail_create_hcd;
- }
-
- /* initialize hcd */
- hcd = usb_create_hcd(&ehci_sh_hc_driver, &pdev->dev,
- dev_name(&pdev->dev));
- if (!hcd) {
- ret = -ENOMEM;
- goto fail_create_hcd;
- }
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- hcd->regs = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(hcd->regs)) {
- ret = PTR_ERR(hcd->regs);
- goto fail_request_resource;
- }
- hcd->rsrc_start = res->start;
- hcd->rsrc_len = resource_size(res);
-
- priv = devm_kzalloc(&pdev->dev, sizeof(struct ehci_sh_priv),
- GFP_KERNEL);
- if (!priv) {
- ret = -ENOMEM;
- goto fail_request_resource;
- }
-
- /* These are optional, we don't care if they fail */
- priv->fclk = devm_clk_get(&pdev->dev, "usb_fck");
- if (IS_ERR(priv->fclk))
- priv->fclk = NULL;
-
- priv->iclk = devm_clk_get(&pdev->dev, "usb_ick");
- if (IS_ERR(priv->iclk))
- priv->iclk = NULL;
-
- clk_enable(priv->fclk);
- clk_enable(priv->iclk);
-
- ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
- if (ret != 0) {
- dev_err(&pdev->dev, "Failed to add hcd");
- goto fail_add_hcd;
- }
- device_wakeup_enable(hcd->self.controller);
-
- priv->hcd = hcd;
- platform_set_drvdata(pdev, priv);
-
- return ret;
-
-fail_add_hcd:
- clk_disable(priv->iclk);
- clk_disable(priv->fclk);
-
-fail_request_resource:
- usb_put_hcd(hcd);
-fail_create_hcd:
- dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), ret);
-
- return ret;
-}
-
-static int ehci_hcd_sh_remove(struct platform_device *pdev)
-{
- struct ehci_sh_priv *priv = platform_get_drvdata(pdev);
- struct usb_hcd *hcd = priv->hcd;
-
- usb_remove_hcd(hcd);
- usb_put_hcd(hcd);
-
- clk_disable(priv->fclk);
- clk_disable(priv->iclk);
-
- return 0;
-}
-
-static void ehci_hcd_sh_shutdown(struct platform_device *pdev)
-{
- struct ehci_sh_priv *priv = platform_get_drvdata(pdev);
- struct usb_hcd *hcd = priv->hcd;
-
- if (hcd->driver->shutdown)
- hcd->driver->shutdown(hcd);
-}
-
-static struct platform_driver ehci_hcd_sh_driver = {
- .probe = ehci_hcd_sh_probe,
- .remove = ehci_hcd_sh_remove,
- .shutdown = ehci_hcd_sh_shutdown,
- .driver = {
- .name = "sh_ehci",
- },
-};
-
-MODULE_ALIAS("platform:sh_ehci");
--
2.39.0
next prev parent reply other threads:[~2023-01-13 6:30 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 6:23 remove arch/sh Christoph Hellwig
2023-01-13 6:23 ` [PATCH 01/22] gpu/drm: remove the shmobile drm driver Christoph Hellwig
2023-01-13 7:46 ` Laurent Pinchart
2023-01-13 7:55 ` Laurent Pinchart
2023-01-13 8:19 ` Geert Uytterhoeven
2023-02-03 7:15 ` Christoph Hellwig
2023-02-03 13:49 ` Laurent Pinchart
2023-02-03 13:53 ` Geert Uytterhoeven
2023-01-13 6:23 ` [PATCH 02/22] usb: remove the dead USB_OHCI_SH option Christoph Hellwig
2023-01-13 7:12 ` Greg Kroah-Hartman
2023-01-13 7:14 ` Christoph Hellwig
2023-01-15 0:55 ` Rob Landley
2023-02-03 7:15 ` Christoph Hellwig
2023-02-03 7:25 ` Greg Kroah-Hartman
2023-01-13 8:59 ` Geert Uytterhoeven
2023-01-13 6:23 ` [PATCH 04/22] sound: remove sound/sh Christoph Hellwig
2023-01-13 16:18 ` Takashi Iwai
2023-01-13 6:23 ` [PATCH 05/22] sound: remove sh-specific sounds/soc/sh drivers Christoph Hellwig
2023-01-17 22:52 ` Kuninori Morimoto
2023-01-13 6:23 ` [PATCH 06/22] watchdog: remove the shwdt driver Christoph Hellwig
2023-01-13 14:00 ` Guenter Roeck
2023-01-13 6:23 ` [PATCH 07/22] cpufreq: remove the sh-cpufreq driver Christoph Hellwig
2023-01-13 6:23 ` [PATCH 08/22] dmaengine: remove the shdmac driver Christoph Hellwig
2023-01-13 6:23 ` [PATCH 09/22] i2c: remove i2c-sh7760 Christoph Hellwig
2023-01-13 6:23 ` [PATCH 10/22] input: remove sh_keysc Christoph Hellwig
2023-01-13 8:28 ` Geert Uytterhoeven
2023-01-13 6:23 ` [PATCH 11/22] mtd/nand: remove sh_flctl Christoph Hellwig
2023-01-13 8:30 ` Geert Uytterhoeven
2023-01-13 10:06 ` Arnd Bergmann
2023-01-13 6:23 ` [PATCH 12/22] net/ethernet/8390: remove stnic Christoph Hellwig
2023-01-13 6:23 ` [PATCH 15/22] spi: remove spi-sh Christoph Hellwig
2023-01-13 6:23 ` [PATCH 16/22] spi: remove spi-sh-sci Christoph Hellwig
2023-01-13 8:50 ` Geert Uytterhoeven
2023-01-13 6:23 ` [PATCH 17/22] spi: remove spi-jcore Christoph Hellwig
2023-01-13 6:23 ` Christoph Hellwig [this message]
2023-01-13 6:23 ` [PATCH 19/22] fbdev: remove sh7760fb Christoph Hellwig
2023-01-13 8:53 ` Geert Uytterhoeven
2023-01-13 6:23 ` [PATCH 20/22] media: remove sh_vou Christoph Hellwig
2023-01-13 8:01 ` Laurent Pinchart
2023-01-13 9:05 ` Hans Verkuil
2023-01-13 6:23 ` [PATCH 21/22] drivers: platform: remove is_sh_early_platform_device Christoph Hellwig
2023-01-13 6:23 ` [PATCH 22/22] drivers: platform: remove early_platform_cleanup Christoph Hellwig
2023-01-13 8:09 ` remove arch/sh John Paul Adrian Glaubitz
2023-01-13 8:26 ` Geert Uytterhoeven
2023-01-13 8:52 ` John Paul Adrian Glaubitz
2023-01-13 19:11 ` Rob Landley
2023-01-13 19:05 ` John Paul Adrian Glaubitz
2023-01-13 23:32 ` Rob Landley
2023-01-16 7:14 ` Christoph Hellwig
2023-01-16 7:13 ` Christoph Hellwig
2023-01-16 8:52 ` John Paul Adrian Glaubitz
2023-02-03 7:14 ` Christoph Hellwig
2023-02-03 8:24 ` John Paul Adrian Glaubitz
2023-02-03 8:30 ` Christoph Hellwig
2023-02-03 10:29 ` John Paul Adrian Glaubitz
2023-02-03 10:33 ` Geert Uytterhoeven
2023-02-03 10:36 ` John Paul Adrian Glaubitz
2023-02-03 15:57 ` Randy Dunlap
2023-02-03 16:04 ` Geert Uytterhoeven
2023-02-09 3:06 ` Rob Landley
2023-02-05 23:08 ` Stephen Rothwell
2023-02-05 23:20 ` John Paul Adrian Glaubitz
2023-02-13 16:30 ` John Paul Adrian Glaubitz
2023-02-07 9:06 ` John Paul Adrian Glaubitz
2023-02-08 1:31 ` Randy Dunlap
2023-02-08 12:13 ` John Paul Adrian Glaubitz
2023-02-08 12:24 ` Huacai Chen
2023-02-08 12:37 ` John Paul Adrian Glaubitz
2023-02-08 14:12 ` Wolfram Sang
2023-02-09 3:09 ` Rob Landley
2023-02-09 9:15 ` John Paul Adrian Glaubitz
2023-01-17 19:13 ` Rob Landley
2023-01-17 20:26 ` Geert Uytterhoeven
2023-01-17 23:05 ` Guenter Roeck
2023-01-18 0:10 ` D. Jeff Dionne
2023-01-18 5:03 ` Rob Landley
2023-01-18 7:46 ` Geert Uytterhoeven
2023-01-18 11:14 ` Rob Landley
[not found] ` <20230113062339.1909087-14-hch@lst.de>
2023-01-13 8:45 ` [PATCH 13/22] pinctrl: remove renesas sh controllers Geert Uytterhoeven
2023-01-13 15:18 ` remove arch/sh Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230113062339.1909087-19-hch@lst.de \
--to=hch@lst.de \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=dalias@libc.org \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=geert+renesas@glider.be \
--cc=gregkh@linuxfoundation.org \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).