diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2022-03-22 17:16:21 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-03-22 17:16:21 -0500 |
| commit | 73c82469bd88ce1c9a4403f34582e544e77f4854 (patch) | |
| tree | 7a2f0aed1983981c6f07d32280ca5204f5473db3 /drivers/pci/hotplug/ibmphp_hpc.c | |
| parent | f787b6821423fe0d79b63ef29ff3cb48b99af34b (diff) | |
| parent | b9fae6a47b8bcb397e6a482095431f6ba9648211 (diff) | |
| download | linux-73c82469bd88ce1c9a4403f34582e544e77f4854.tar.gz linux-73c82469bd88ce1c9a4403f34582e544e77f4854.tar.bz2 linux-73c82469bd88ce1c9a4403f34582e544e77f4854.zip | |
Merge branch 'pci/misc'
- Update the aer-inject URL (Yicong Yang)
- Declare pci_filp_private only when HAVE_PCI_MMAP to avoid unused struct
definition (Krzysztof Wilczyński)
- Remove unused assignments (Bjorn Helgaas)
- Add #includes to asm/pci_x86.h to prevent build errors (Randy Dunlap)
* pci/misc:
x86/PCI: Add #includes to asm/pci_x86.h
PCI: ibmphp: Remove unused assignments
PCI: cpqphp: Remove unused assignments
PCI: fu740: Remove unused assignments
PCI: kirin: Remove unused assignments
PCI: Remove unused assignments
PCI: Declare pci_filp_private only when HAVE_PCI_MMAP
PCI/AER: Update aer-inject URL
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_hpc.c')
| -rw-r--r-- | drivers/pci/hotplug/ibmphp_hpc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c index 508a62a6b5f9..a5720d12e573 100644 --- a/drivers/pci/hotplug/ibmphp_hpc.c +++ b/drivers/pci/hotplug/ibmphp_hpc.c @@ -325,11 +325,9 @@ static u8 i2c_ctrl_write(struct controller *ctlr_ptr, void __iomem *WPGBbar, u8 static u8 isa_ctrl_read(struct controller *ctlr_ptr, u8 offset) { u16 start_address; - u16 end_address; u8 data; start_address = ctlr_ptr->u.isa_ctlr.io_start; - end_address = ctlr_ptr->u.isa_ctlr.io_end; data = inb(start_address + offset); return data; } |