diff mbox series

ARM/PCI: Remove struct msi_controller from struct hw_pci

Message ID 20200904141607.4066-1-lorenzo.pieralisi@arm.com (mailing list archive)
State New, archived
Headers show
Series ARM/PCI: Remove struct msi_controller from struct hw_pci | expand

Commit Message

Lorenzo Pieralisi Sept. 4, 2020, 2:16 p.m. UTC
The msi_ctrl field in struct hw_pci is currently unused by arm/mach
PCI host controller drivers.

Remove it.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
---
 arch/arm/include/asm/mach/pci.h | 1 -
 arch/arm/kernel/bios32.c        | 1 -
 2 files changed, 2 deletions(-)

Comments

Rob Herring (Arm) Sept. 4, 2020, 7:08 p.m. UTC | #1
On Fri, Sep 4, 2020 at 8:16 AM Lorenzo Pieralisi
<lorenzo.pieralisi@arm.com> wrote:
>
> The msi_ctrl field in struct hw_pci is currently unused by arm/mach
> PCI host controller drivers.

And we won't be adding any new users.

>
> Remove it.

io_optional and align_resource fields are also unused.

>
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Russell King <linux@armlinux.org.uk>
> ---
>  arch/arm/include/asm/mach/pci.h | 1 -
>  arch/arm/kernel/bios32.c        | 1 -
>  2 files changed, 2 deletions(-)
>
> diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
> index 83d340702680..f3a284e6a90b 100644
> --- a/arch/arm/include/asm/mach/pci.h
> +++ b/arch/arm/include/asm/mach/pci.h
> @@ -17,7 +17,6 @@ struct pci_host_bridge;
>  struct device;
>
>  struct hw_pci {
> -       struct msi_controller *msi_ctrl;
>         struct pci_ops  *ops;
>         int             nr_controllers;
>         unsigned int    io_optional:1;
> diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
> index eecec16aa708..6b73e60cf95a 100644
> --- a/arch/arm/kernel/bios32.c
> +++ b/arch/arm/kernel/bios32.c
> @@ -480,7 +480,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
>                                 bridge->sysdata = sys;
>                                 bridge->busnr = sys->busnr;
>                                 bridge->ops = hw->ops;
> -                               bridge->msi = hw->msi_ctrl;
>                                 bridge->align_resource =
>                                                 hw->align_resource;
>
> --
> 2.26.1
>
diff mbox series

Patch

diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
index 83d340702680..f3a284e6a90b 100644
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
@@ -17,7 +17,6 @@  struct pci_host_bridge;
 struct device;
 
 struct hw_pci {
-	struct msi_controller *msi_ctrl;
 	struct pci_ops	*ops;
 	int		nr_controllers;
 	unsigned int	io_optional:1;
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index eecec16aa708..6b73e60cf95a 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -480,7 +480,6 @@  static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
 				bridge->sysdata = sys;
 				bridge->busnr = sys->busnr;
 				bridge->ops = hw->ops;
-				bridge->msi = hw->msi_ctrl;
 				bridge->align_resource =
 						hw->align_resource;