diff mbox series

[04/13] arm: drop an obsolete ifdef with the removed config PCI_HOST_ITE8152

Message ID 20211028141938.3530-5-lukas.bulwahn@gmail.com (mailing list archive)
State New, archived
Headers show
Series Kconfig symbol clean-up on ./arch/arm{64} | expand

Commit Message

Lukas Bulwahn Oct. 28, 2021, 2:19 p.m. UTC
Commit 6da5238fa384 ("ARM: 8993/1: remove it8152 PCI controller driver")
removes the config PCI_HOST_ITE8152, but left a dangling obsolete ifndef
in ./arch/arm/kernel/bios32.c.

Hence, ./scripts/checkkconfigsymbols.py warns:

PCI_HOST_ITE8152
Referencing files: arch/arm/kernel/bios32.c

Remove this obsolete ifndef.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
 arch/arm/kernel/bios32.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Arnd Bergmann Oct. 28, 2021, 2:46 p.m. UTC | #1
On Thu, Oct 28, 2021 at 4:19 PM Lukas Bulwahn <lukas.bulwahn@gmail.com> wrote:
>
> Commit 6da5238fa384 ("ARM: 8993/1: remove it8152 PCI controller driver")
> removes the config PCI_HOST_ITE8152, but left a dangling obsolete ifndef
> in ./arch/arm/kernel/bios32.c.
>
> Hence, ./scripts/checkkconfigsymbols.py warns:
>
> PCI_HOST_ITE8152
> Referencing files: arch/arm/kernel/bios32.c
>
> Remove this obsolete ifndef.
>
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>

Reviewed-by: Arnd Bergmann <arnd@arndb.de>

I wonder if we should just remove this function and use the
(non-empty) default version instead.

96c5590058d7 ("PCI: Pull PCI 'latency timer' setup up into the core")
introduced that generic version, and I suspect the arm version
was left out by mistake, but it's not clear from that patch.

         Arnd
Russell King (Oracle) Oct. 28, 2021, 3:35 p.m. UTC | #2
On Thu, Oct 28, 2021 at 04:46:38PM +0200, Arnd Bergmann wrote:
> On Thu, Oct 28, 2021 at 4:19 PM Lukas Bulwahn <lukas.bulwahn@gmail.com> wrote:
> >
> > Commit 6da5238fa384 ("ARM: 8993/1: remove it8152 PCI controller driver")
> > removes the config PCI_HOST_ITE8152, but left a dangling obsolete ifndef
> > in ./arch/arm/kernel/bios32.c.
> >
> > Hence, ./scripts/checkkconfigsymbols.py warns:
> >
> > PCI_HOST_ITE8152
> > Referencing files: arch/arm/kernel/bios32.c
> >
> > Remove this obsolete ifndef.
> >
> > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> 
> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
> 
> I wonder if we should just remove this function and use the
> (non-empty) default version instead.
> 
> 96c5590058d7 ("PCI: Pull PCI 'latency timer' setup up into the core")
> introduced that generic version, and I suspect the arm version
> was left out by mistake, but it's not clear from that patch.

That was because PCI_HOST_ITE8152 needed something different from the
"do nothing" default (setting the PCI latency timer to default to 64
as the new generic code did.)
Lukas Bulwahn Oct. 29, 2021, 5:53 a.m. UTC | #3
On Thu, Oct 28, 2021 at 5:35 PM Russell King (Oracle)
<linux@armlinux.org.uk> wrote:
>
> On Thu, Oct 28, 2021 at 04:46:38PM +0200, Arnd Bergmann wrote:
> > On Thu, Oct 28, 2021 at 4:19 PM Lukas Bulwahn <lukas.bulwahn@gmail.com> wrote:
> > >
> > > Commit 6da5238fa384 ("ARM: 8993/1: remove it8152 PCI controller driver")
> > > removes the config PCI_HOST_ITE8152, but left a dangling obsolete ifndef
> > > in ./arch/arm/kernel/bios32.c.
> > >
> > > Hence, ./scripts/checkkconfigsymbols.py warns:
> > >
> > > PCI_HOST_ITE8152
> > > Referencing files: arch/arm/kernel/bios32.c
> > >
> > > Remove this obsolete ifndef.
> > >
> > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> >
> > Reviewed-by: Arnd Bergmann <arnd@arndb.de>
> >
> > I wonder if we should just remove this function and use the
> > (non-empty) default version instead.
> >
> > 96c5590058d7 ("PCI: Pull PCI 'latency timer' setup up into the core")
> > introduced that generic version, and I suspect the arm version
> > was left out by mistake, but it's not clear from that patch.
>
> That was because PCI_HOST_ITE8152 needed something different from the
> "do nothing" default (setting the PCI latency timer to default to 64
> as the new generic code did.)
>

So, can we just drop the empty pcibios_set_master() function in
bios32.c and the pci handling will now (after the removal of
PCI_HOST_ITE8152) just do The Right Thing(TM)?

If you can confirm that, I will send an updated patch here.

Thanks,

Lukas
diff mbox series

Patch

diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index e7ef2b5bea9c..26b5d8361980 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -529,12 +529,10 @@  void pci_common_init_dev(struct device *parent, struct hw_pci *hw)
 	}
 }
 
-#ifndef CONFIG_PCI_HOST_ITE8152
 void pcibios_set_master(struct pci_dev *dev)
 {
 	/* No special bus mastering setup handling */
 }
-#endif
 
 char * __init pcibios_setup(char *str)
 {