* [PATCH] h8300: pci: Remove local declaration of pcibios_penalize_isa_irq
@ 2018-12-27 16:46 Guenter Roeck
2018-12-28 4:22 ` Sinan Kaya
2018-12-28 15:21 ` Yoshinori Sato
0 siblings, 2 replies; 3+ messages in thread
From: Guenter Roeck @ 2018-12-27 16:46 UTC (permalink / raw)
To: Yoshinori Sato
Cc: uclinux-h8-devel, linux-kernel, Guenter Roeck, Sinan Kaya, Bjorn Helgaas
h8300 builds fail with:
In file included from drivers/of/address.c:11:
include/linux/pci.h:1966:20: error: redefinition of 'pcibios_penalize_isa_irq'
This is because CONFIG_PCI is not enabled, and pcibios_penalize_isa_irq()
is now declared as inline static function in generic code if this is the
case. Since h8300 does not support PCI to start with, fix the problem by
removing the architecture specific pci.h.
Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
Cc: Sinan Kaya <okaya@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
arch/h8300/include/asm/Kbuild | 1 +
arch/h8300/include/asm/pci.h | 18 ------------------
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 arch/h8300/include/asm/pci.h
diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
index a5d0b2991f47..cd400d353d18 100644
--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@ -33,6 +33,7 @@ generic-y += mmu.h
generic-y += mmu_context.h
generic-y += module.h
generic-y += parport.h
+generic-y += pci.h
generic-y += percpu.h
generic-y += pgalloc.h
generic-y += preempt.h
diff --git a/arch/h8300/include/asm/pci.h b/arch/h8300/include/asm/pci.h
deleted file mode 100644
index d4d345a52092..000000000000
--- a/arch/h8300/include/asm/pci.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_H8300_PCI_H
-#define _ASM_H8300_PCI_H
-
-/*
- * asm-h8300/pci.h - H8/300 specific PCI declarations.
- *
- * Yoshinori Sato <ysato@users.sourceforge.jp>
- */
-
-#define pcibios_assign_all_busses() 0
-
-static inline void pcibios_penalize_isa_irq(int irq, int active)
-{
- /* We don't do dynamic PCI IRQ allocation */
-}
-
-#endif /* _ASM_H8300_PCI_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] h8300: pci: Remove local declaration of pcibios_penalize_isa_irq
2018-12-27 16:46 [PATCH] h8300: pci: Remove local declaration of pcibios_penalize_isa_irq Guenter Roeck
@ 2018-12-28 4:22 ` Sinan Kaya
2018-12-28 15:21 ` Yoshinori Sato
1 sibling, 0 replies; 3+ messages in thread
From: Sinan Kaya @ 2018-12-28 4:22 UTC (permalink / raw)
To: Guenter Roeck; +Cc: Yoshinori Sato, uclinux-h8-devel, open list, Bjorn Helgaas
On Thu, Dec 27, 2018 at 7:46 PM Guenter Roeck <linux@roeck-us.net> wrote:
>
> h8300 builds fail with:
>
> In file included from drivers/of/address.c:11:
> include/linux/pci.h:1966:20: error: redefinition of 'pcibios_penalize_isa_irq'
>
> This is because CONFIG_PCI is not enabled, and pcibios_penalize_isa_irq()
> is now declared as inline static function in generic code if this is the
> case. Since h8300 does not support PCI to start with, fix the problem by
> removing the architecture specific pci.h.
>
> Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
> Cc: Sinan Kaya <okaya@kernel.org>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> arch/h8300/include/asm/Kbuild | 1 +
> arch/h8300/include/asm/pci.h | 18 ------------------
> 2 files changed, 1 insertion(+), 18 deletions(-)
> delete mode 100644 arch/h8300/include/asm/pci.h
>
Thanks, makes sense.
Reviewed-by : Sinan Kaya <okaya@kernel.org>
> diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
> index a5d0b2991f47..cd400d353d18 100644
> --- a/arch/h8300/include/asm/Kbuild
> +++ b/arch/h8300/include/asm/Kbuild
> @@ -33,6 +33,7 @@ generic-y += mmu.h
> generic-y += mmu_context.h
> generic-y += module.h
> generic-y += parport.h
> +generic-y += pci.h
> generic-y += percpu.h
> generic-y += pgalloc.h
> generic-y += preempt.h
> diff --git a/arch/h8300/include/asm/pci.h b/arch/h8300/include/asm/pci.h
> deleted file mode 100644
> index d4d345a52092..000000000000
> --- a/arch/h8300/include/asm/pci.h
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef _ASM_H8300_PCI_H
> -#define _ASM_H8300_PCI_H
> -
> -/*
> - * asm-h8300/pci.h - H8/300 specific PCI declarations.
> - *
> - * Yoshinori Sato <ysato@users.sourceforge.jp>
> - */
> -
> -#define pcibios_assign_all_busses() 0
> -
> -static inline void pcibios_penalize_isa_irq(int irq, int active)
> -{
> - /* We don't do dynamic PCI IRQ allocation */
> -}
> -
> -#endif /* _ASM_H8300_PCI_H */
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] h8300: pci: Remove local declaration of pcibios_penalize_isa_irq
2018-12-27 16:46 [PATCH] h8300: pci: Remove local declaration of pcibios_penalize_isa_irq Guenter Roeck
2018-12-28 4:22 ` Sinan Kaya
@ 2018-12-28 15:21 ` Yoshinori Sato
1 sibling, 0 replies; 3+ messages in thread
From: Yoshinori Sato @ 2018-12-28 15:21 UTC (permalink / raw)
To: Guenter Roeck; +Cc: uclinux-h8-devel, linux-kernel, Sinan Kaya, Bjorn Helgaas
On Fri, 28 Dec 2018 01:46:38 +0900,
Guenter Roeck wrote:
>
> h8300 builds fail with:
>
> In file included from drivers/of/address.c:11:
> include/linux/pci.h:1966:20: error: redefinition of 'pcibios_penalize_isa_irq'
>
> This is because CONFIG_PCI is not enabled, and pcibios_penalize_isa_irq()
> is now declared as inline static function in generic code if this is the
> case. Since h8300 does not support PCI to start with, fix the problem by
> removing the architecture specific pci.h.
>
> Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
> Cc: Sinan Kaya <okaya@kernel.org>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> arch/h8300/include/asm/Kbuild | 1 +
> arch/h8300/include/asm/pci.h | 18 ------------------
> 2 files changed, 1 insertion(+), 18 deletions(-)
> delete mode 100644 arch/h8300/include/asm/pci.h
>
> diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
> index a5d0b2991f47..cd400d353d18 100644
> --- a/arch/h8300/include/asm/Kbuild
> +++ b/arch/h8300/include/asm/Kbuild
> @@ -33,6 +33,7 @@ generic-y += mmu.h
> generic-y += mmu_context.h
> generic-y += module.h
> generic-y += parport.h
> +generic-y += pci.h
> generic-y += percpu.h
> generic-y += pgalloc.h
> generic-y += preempt.h
> diff --git a/arch/h8300/include/asm/pci.h b/arch/h8300/include/asm/pci.h
> deleted file mode 100644
> index d4d345a52092..000000000000
> --- a/arch/h8300/include/asm/pci.h
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef _ASM_H8300_PCI_H
> -#define _ASM_H8300_PCI_H
> -
> -/*
> - * asm-h8300/pci.h - H8/300 specific PCI declarations.
> - *
> - * Yoshinori Sato <ysato@users.sourceforge.jp>
> - */
> -
> -#define pcibios_assign_all_busses() 0
> -
> -static inline void pcibios_penalize_isa_irq(int irq, int active)
> -{
> - /* We don't do dynamic PCI IRQ allocation */
> -}
> -
> -#endif /* _ASM_H8300_PCI_H */
> --
> 2.7.4
>
OK.
Applied h8300-next.
--
Yosinori Sato
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-28 15:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-27 16:46 [PATCH] h8300: pci: Remove local declaration of pcibios_penalize_isa_irq Guenter Roeck
2018-12-28 4:22 ` Sinan Kaya
2018-12-28 15:21 ` Yoshinori Sato
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).