Skip to contentSkip to conversation

sh: Drop the leftovers of the removed CONFIG_USB_OHCI_SH

PATCH In review Karl Mehltretter 2 participants 6 messages Sep 5 SuperH

lore
Share & tools
lore
#0 lore raw

cover sh: Drop the leftovers of the removed CONFIG_USB_OHCI_SH

Commit 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option") removed the symbol, but four SH board entries still select it and one defconfig still sets it. Kconfig silently ignores both, so nothing changes in any configuration; the patches only remove the dead lines. Parsed with make ARCH=sh allnoconfig and olddefconfig on sh7757lcr_defconfig.

Karl Mehltretter (2):
sh: Drop the selects of the removed CONFIG_USB_OHCI_SH symbol
sh: configs: Drop CONFIG_USB_OHCI_SH from sh7757lcr_defconfig

 arch/sh/Kconfig                     | 4 ----
 arch/sh/configs/sh7757lcr_defconfig | 1 -
 2 files changed, 5 deletions(-)
Signature · 1 line
2.53.0
#1 lore raw

PATCH 1/2 sh: Drop the selects of the removed CONFIG_USB_OHCI_SH symbol

Commit 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option") removed CONFIG_USB_OHCI_SH, but four SH board entries still select it under CONFIG_USB_OHCI_HCD. Selecting a symbol that does not exist is silently ignored, so these lines do nothing.

Remove them.

Fixes 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option")
Assisted-by LLM
---
 arch/sh/Kconfig | 4 ----
 1 file changed, 4 deletions(-)
arch/sh/Kconfig +0 -4
index d60f1d5a94c0..01e37d5dded9 100644
@@ -331,7 +331,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.
@@ -341,7 +340,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.
 
@@ -426,7 +424,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.
 
@@ -452,7 +449,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
 
Signature · 1 line
2.53.0
#2 lore raw

Re: [PATCH 1/2] sh: Drop the selects of the removed CONFIG_USB_OHCI_SH symbol

Hi Karl,

Thanks for your patch!

Quoted 1 line · Karl Mehltretter

Commit 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option") removed

So you (or the LLM) did look at that commit?

Quoted 13 lines

CONFIG_USB_OHCI_SH, but four SH board entries still select it under CONFIG_USB_OHCI_HCD. Selecting a symbol that does not exist is silently ignored, so these lines do nothing.

Remove them.

Fixes 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option")
Assisted-by LLM

arch/sh/Kconfig config CPU_SUBTYPE_SH7720 · line 334

Quoted 4 lines
arch/sh/Kconfig +0 -1
@@ -331,7 +331,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

This is wrong, it should select USB_OHCI_HCD_PLATFORM instead. Someone has already sent a patch for that[1], so it would be great if that could be picked up instead.

[1] "[PATCH] sh: Use generic OHCI platform provider symbol"

    https://lore.kernel.org/[email protected]/

arch/sh/Kconfig config CPU_SUBTYPE_SH7720 · line 336

Quoted 3 lines
arch/sh/Kconfig +0 -0
        select PINCTRL
        help
          Select SH7720 if you have a SH3-DSP SH7720 CPU.

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
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
#3 lore raw

Re: [PATCH 1/2] sh: Drop the selects of the removed CONFIG_USB_OHCI_SH symbol

Quoted 11 lines · Geert Uytterhoeven
Quoted 3 lines

select CPU_HAS_DSP
select SYS_SUPPORTS_SH_CMT
- select USB_OHCI_SH if USB_OHCI_HCD

This is wrong, it should select USB_OHCI_HCD_PLATFORM instead. Someone has already sent a patch for that[1], so it would be great if that could be picked up instead.

[1] "[PATCH] sh: Use generic OHCI platform provider symbol"

    https://lore.kernel.org/[email protected]/

Yes my patch is not "wrong" (doesn't make things worse) but clearly this is the proper solution.

So please consider both patches of this series withdrawn, the defconfig change in 2/2 is covered by Pengpeng's patch as well.

I have resent Pengpeng's patch as v2 with his authorship kept:

https://lore.kernel.org/r/[email protected]/

Thanks,
Karl

#4 lore raw

PATCH 2/2 sh: configs: Drop CONFIG_USB_OHCI_SH from sh7757lcr_defconfig

In reply to Karl Mehltretter

Commit 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option") removed the symbol. The defconfig still sets it, which olddefconfig silently drops on every use.

Drop the line.

Fixes 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option")
Assisted-by LLM
---
 arch/sh/configs/sh7757lcr_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/sh/configs/sh7757lcr_defconfig +0 -1
index 93066ae429ec..a7ec7a23999d 100644
@@ -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.53.0
#5 lore raw
In reply to Karl Mehltretter
Quoted 6 lines · Karl Mehltretter

Commit 4f6dfc2136fb ("usb: remove the dead USB_OHCI_SH option") removed the symbol, but four SH board entries still select it and one defconfig still sets it. Kconfig silently ignores both, so nothing changes in any configuration; the patches only remove the dead lines. Parsed with make ARCH=sh allnoconfig and olddefconfig on sh7757lcr_defconfig.

Quoted 8 lines

Karl Mehltretter (2):
sh: Drop the selects of the removed CONFIG_USB_OHCI_SH symbol
sh: configs: Drop CONFIG_USB_OHCI_SH from sh7757lcr_defconfig

 arch/sh/Kconfig                     | 4 ----
 arch/sh/configs/sh7757lcr_defconfig | 1 -
 2 files changed, 5 deletions(-)

Consider this series dropped, superseded by:

https://lore.kernel.org/r/[email protected]/

Karl