diff mbox series

[25/27] usb: remove ohci-tmio driver

Message ID 20230105134622.254560-26-arnd@kernel.org
State New
Headers
Series ARM: pxa: remove all unused boards&drivers |

Commit Message

Arnd Bergmann Jan. 5, 2023, 1:46 p.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

The TMIO MFD driver is getting removed, so its OHCI portion is not
used any more either.

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/usb/host/ohci-hcd.c  |  18 --
 drivers/usb/host/ohci-tmio.c | 364 -----------------------------------
 2 files changed, 382 deletions(-)
 delete mode 100644 drivers/usb/host/ohci-tmio.c

Comments

Greg KH Jan. 5, 2023, 2:55 p.m. UTC | #1 
On Thu, Jan 05, 2023 at 02:46:20PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The TMIO MFD driver is getting removed, so its OHCI portion is not
> used any more either.
> 
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-usb@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/usb/host/ohci-hcd.c  |  18 --
>  drivers/usb/host/ohci-tmio.c | 364 -----------------------------------
>  2 files changed, 382 deletions(-)
>  delete mode 100644 drivers/usb/host/ohci-tmio.c

I can take this through the USB tree, otherwise feel free to take it and
add:

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Arnd Bergmann Jan. 5, 2023, 3:03 p.m. UTC | #2 
On Thu, Jan 5, 2023, at 15:55, Greg Kroah-Hartman wrote:
> On Thu, Jan 05, 2023 at 02:46:20PM +0100, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>> 
>> The TMIO MFD driver is getting removed, so its OHCI portion is not
>> used any more either.
>> 
>> Cc: Alan Stern <stern@rowland.harvard.edu>
>> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> Cc: linux-usb@vger.kernel.org
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>>  drivers/usb/host/ohci-hcd.c  |  18 --
>>  drivers/usb/host/ohci-tmio.c | 364 -----------------------------------
>>  2 files changed, 382 deletions(-)
>>  delete mode 100644 drivers/usb/host/ohci-tmio.c
>
> I can take this through the USB tree, otherwise feel free to take it and
> add:
>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Thanks!

I think it's easier to keep this together with the patches
that use the linux/mfd/tmio.h header, so I can remove
that file without getting build regressions in my tree.

    Arnd
diff mbox series

Patch

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 0457dd9f6c19..4f9982ecfb58 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1264,11 +1264,6 @@  MODULE_LICENSE ("GPL");
 #define SM501_OHCI_DRIVER	ohci_hcd_sm501_driver
 #endif
 
-#ifdef CONFIG_MFD_TC6393XB
-#include "ohci-tmio.c"
-#define TMIO_OHCI_DRIVER	ohci_hcd_tmio_driver
-#endif
-
 static int __init ohci_hcd_mod_init(void)
 {
 	int retval = 0;
@@ -1306,19 +1301,9 @@  static int __init ohci_hcd_mod_init(void)
 		goto error_sm501;
 #endif
 
-#ifdef TMIO_OHCI_DRIVER
-	retval = platform_driver_register(&TMIO_OHCI_DRIVER);
-	if (retval < 0)
-		goto error_tmio;
-#endif
-
 	return retval;
 
 	/* Error path */
-#ifdef TMIO_OHCI_DRIVER
-	platform_driver_unregister(&TMIO_OHCI_DRIVER);
- error_tmio:
-#endif
 #ifdef SM501_OHCI_DRIVER
 	platform_driver_unregister(&SM501_OHCI_DRIVER);
  error_sm501:
@@ -1345,9 +1330,6 @@  module_init(ohci_hcd_mod_init);
 
 static void __exit ohci_hcd_mod_exit(void)
 {
-#ifdef TMIO_OHCI_DRIVER
-	platform_driver_unregister(&TMIO_OHCI_DRIVER);
-#endif
 #ifdef SM501_OHCI_DRIVER
 	platform_driver_unregister(&SM501_OHCI_DRIVER);
 #endif
diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
deleted file mode 100644
index 49539b9f0e94..000000000000