arch: sh: remove references to config USB_OHCI_SH
Subsystems (2)
PATCH 1/1 arch: sh: remove references to config USB_OHCI_SH
Commit 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option") left some references to the config USB_OHCI_SH in ./arch/sh/ around, expecting those to be removed with the whole SH architecture deletion.
As that did not happen, do minor clean-up instead and remove the references to the removed config USB_OHCI_SH instead.
---
Christoph, please ack.
SH architecture maintainers, please pick this minor clean-up patch.
arch/sh/Kconfig | 4 ---- arch/sh/configs/sh7757lcr_defconfig | 1 - 2 files changed, 5 deletions(-)
arch/sh/Kconfig +0 -4
@@ -326,7 +326,6 @@ config CPU_SUBTYPE_SH7720 select CPU_SH3 select CPU_HAS_DSP select SYS_SUPPORTS_SH_CMT - select USB_OHCI_SH if USB_OHCI_HCD select PINCTRL help Select SH7720 if you have a SH3-DSP SH7720 CPU.
@@ -336,7 +335,6 @@ config CPU_SUBTYPE_SH7721 select CPU_SH3 select CPU_HAS_DSP select SYS_SUPPORTS_SH_CMT - select USB_OHCI_SH if USB_OHCI_HCD help Select SH7721 if you have a SH3-DSP SH7721 CPU.
@@ -425,7 +423,6 @@ config CPU_SUBTYPE_SH7757 config CPU_SUBTYPE_SH7763 bool "Support SH7763 processor" select CPU_SH4A - select USB_OHCI_SH if USB_OHCI_HCD help Select SH7763 if you have a SH4A SH7763(R5S77631) CPU.
@@ -451,7 +448,6 @@ config CPU_SUBTYPE_SH7786 select CPU_SHX3 select CPU_HAS_PTEAEX select GENERIC_CLOCKEVENTS_BROADCAST if SMP - select USB_OHCI_SH if USB_OHCI_HCD select USB_EHCI_SH if USB_EHCI_HCD select PINCTRL
arch/sh/configs/sh7757lcr_defconfig +0 -1
@@ -58,7 +58,6 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_SH=y CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_SH=y CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_SDHI=y
Signature · 1 line
2.17.1
Hi Lukas,
Quoted 8 lines · Lukas Bulwahn
Commit
4f6dfc2136fb("usb: remove the deadUSB_OHCI_SHoption") left some references to the configUSB_OHCI_SHin./arch/sh/around, expecting those to be removed with the whole SH architecture deletion.As that did not happen, do minor clean-up instead and remove the references to the removed config
USB_OHCI_SHinstead.Signed-off-by Lukas Bulwahn <[email protected]>
Thanks for your patch!
arch/sh/Kconfig config CPU_SUBTYPE_SH7720 · line 329
Quoted 7 lines
arch/sh/Kconfig +0
-1@@ -326,7 +326,6 @@ config CPU_SUBTYPE_SH7720 select CPU_SH3 select CPU_HAS_DSP select SYS_SUPPORTS_SH_CMT - select USB_OHCI_SH if USB_OHCI_HCD
Shouldn't this select USB_OHCI_HCD_PLATFORM instead, as the (now removed) Kconfig help text for USB_OHCI_SH used to say?
+ select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
I completely forgot I already made that comment before, cfr.
https://lore.kernel.org/all/CAMuHMdVM3BpvVD3c4gp1OidnwF5zFd4MJecij7zWBnahzNaSNw@mail.gmail.com
The same is true for the three selects below. As USB is now broken, the proper solution will need
Quoted 32 lines
arch/sh/Kconfig +0
-3select PINCTRL help Select SH7720 if you have a SH3-DSP SH7720 CPU.@@ -336,7 +335,6 @@ config CPU_SUBTYPE_SH7721 select CPU_SH3 select CPU_HAS_DSP select SYS_SUPPORTS_SH_CMT - select USB_OHCI_SH if USB_OHCI_HCD help Select SH7721 if you have a SH3-DSP SH7721 CPU.@@ -425,7 +423,6 @@ config CPU_SUBTYPE_SH7757 config CPU_SUBTYPE_SH7763 bool "Support SH7763 processor" select CPU_SH4A - select USB_OHCI_SH if USB_OHCI_HCD help Select SH7763 if you have a SH4A SH7763(R5S77631) CPU.@@ -451,7 +448,6 @@ config CPU_SUBTYPE_SH7786 select CPU_SHX3 select CPU_HAS_PTEAEX select GENERIC_CLOCKEVENTS_BROADCAST if SMP - select USB_OHCI_SH if USB_OHCI_HCD select USB_EHCI_SH if USB_EHCI_HCD select PINCTRLarch/sh/configs/sh7757lcr_defconfig +0
-0
arch/sh/configs/sh7757lcr_defconfig CONFIG_USB=y · line 63
Quoted 7 lines
arch/sh/configs/sh7757lcr_defconfig +0
-1@@ -58,7 +58,6 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_SH=y CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_SH=y CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_SDHI=y
This part is fine.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
John Paul Adrian Glaubitz
maintainerHi Geert!
Quoted 25 lines · Geert Uytterhoeven
Hi Lukas,
Quoted 8 lines · Lukas Bulwahn
Commit
4f6dfc2136fb("usb: remove the deadUSB_OHCI_SHoption") left some references to the configUSB_OHCI_SHin./arch/sh/around, expecting those to be removed with the whole SH architecture deletion.As that did not happen, do minor clean-up instead and remove the references to the removed config
USB_OHCI_SHinstead.Signed-off-by Lukas Bulwahn <[email protected]>Thanks for your patch!
arch/sh/Kconfig config CPU_SUBTYPE_SH7720 · line 329
Quoted 7 lines
arch/sh/Kconfig +0
-1@@ -326,7 +326,6 @@ config CPU_SUBTYPE_SH7720 select CPU_SH3 select CPU_HAS_DSP select SYS_SUPPORTS_SH_CMT - select USB_OHCI_SH if USB_OHCI_HCDShouldn't this select
USB_OHCI_HCD_PLATFORMinstead, as the (now removed)Kconfighelp text forUSB_OHCI_SHused to say?
Quoted 8 lines
+ select
USB_OHCI_HCD_PLATFORMifUSB_OHCI_HCDI completely forgot I already made that comment before, cfr.
https://lore.kernel.org/all/CAMuHMdVM3BpvVD3c4gp1OidnwF5zFd4MJecij7zWBnahzNaSNw@mail.gmail.comThe same is true for the three selects below. As USB is now broken, the proper solution will need
Fixes 4f6dfc2136fb2e8d ("usb: remove the dead USB_OHCI_SH option")
Thanks a lot for catching this!
@Lukas: Can you send a new patch with the suggested changes?
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Quoted 38 lines · John Paul Adrian Glaubitz
Hi Geert!
Quoted 33 lines · Geert Uytterhoeven
Hi Lukas,
Quoted 8 lines · Lukas Bulwahn
Commit
4f6dfc2136fb("usb: remove the deadUSB_OHCI_SHoption") left some references to the configUSB_OHCI_SHin./arch/sh/around, expecting those to be removed with the whole SH architecture deletion.As that did not happen, do minor clean-up instead and remove the references to the removed config
USB_OHCI_SHinstead.Signed-off-by Lukas Bulwahn <[email protected]>Thanks for your patch!
arch/sh/Kconfig config CPU_SUBTYPE_SH7720 · line 329
Quoted 7 lines
arch/sh/Kconfig +0
-1@@ -326,7 +326,6 @@ config CPU_SUBTYPE_SH7720 select CPU_SH3 select CPU_HAS_DSP select SYS_SUPPORTS_SH_CMT - select USB_OHCI_SH if USB_OHCI_HCDShouldn't this select
USB_OHCI_HCD_PLATFORMinstead, as the (now removed)Kconfighelp text forUSB_OHCI_SHused to say?+ select
USB_OHCI_HCD_PLATFORMifUSB_OHCI_HCDI completely forgot I already made that comment before, cfr.
https://lore.kernel.org/all/CAMuHMdVM3BpvVD3c4gp1OidnwF5zFd4MJecij7zWBnahzNaSNw@mail.gmail.comThe same is true for the three selects below. As USB is now broken, the proper solution will need
Fixes 4f6dfc2136fb2e8d ("usb: remove the dead USB_OHCI_SH option")
Well, I assumed that I am just cleaning up some minor stuff, not fixing broken code...
With your link and explanation, Geert, I know what needs to be done. Thanks.
Quoted 4 lines
Thanks a lot for catching this!
@Lukas: Can you send a new patch with the suggested changes?
I will send a new patch in a second.
Lukas
Quoted 7 lines
Adrian
--
.''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913