diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:22 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:22 +0300 |
| commit | 31311031d73f4477b3a6911d814d16962bd00348 (patch) | |
| tree | 75f7fae80bcbbbca81ba48a5b9e2f9322d78a194 /drivers/pci | |
| parent | 6d34adbe0eb0e860ce70a0e63ae1d68cbcc0a996 (diff) | |
| parent | ea3b50c51d19e2ac00861ac195a3ed5617765255 (diff) | |
| download | linux-31311031d73f4477b3a6911d814d16962bd00348.tar.xz | |
Merge branch 'pci/hotplug'
- Fix acpiphp reference count leak (Feilong Lin)
* pci/hotplug:
PCI: acpiphp: Fix whitespace issue
PCI: shpchp: Remove unused shpc_writeb()
PCI: cpqphp: Use DEFINE_SPINLOCK() for int15_lock
ACPI / hotplug / PCI: Fix reference count leak in enable_slot()
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp.h | 3 | ||||
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 1 | ||||
| -rw-r--r-- | drivers/pci/hotplug/cpqphp_nvram.c | 5 | ||||
| -rw-r--r-- | drivers/pci/hotplug/shpchp_hpc.c | 5 |
4 files changed, 3 insertions, 11 deletions
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index a74b274a8c45..1f8ab4377ad8 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h @@ -148,8 +148,7 @@ static inline struct acpiphp_root_context *to_acpiphp_root_context(struct acpi_h * ACPI has no generic method of setting/getting attention status * this allows for device specific driver registration */ -struct acpiphp_attention_info -{ +struct acpiphp_attention_info { int (*set_attn)(struct hotplug_slot *slot, u8 status); int (*get_attn)(struct hotplug_slot *slot, u8 *status); struct module *owner; diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 3365c93abf0e..f031302ad401 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -533,6 +533,7 @@ static void enable_slot(struct acpiphp_slot *slot, bool bridge) slot->flags &= ~SLOT_ENABLED; continue; } + pci_dev_put(dev); } } diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c index 00cd2b43364f..7a65d427ac11 100644 --- a/drivers/pci/hotplug/cpqphp_nvram.c +++ b/drivers/pci/hotplug/cpqphp_nvram.c @@ -80,7 +80,7 @@ static u8 evbuffer[1024]; static void __iomem *compaq_int15_entry_point; /* lock for ordering int15_bios_call() */ -static spinlock_t int15_lock; +static DEFINE_SPINLOCK(int15_lock); /* This is a series of function that deals with @@ -415,9 +415,6 @@ void compaq_nvram_init(void __iomem *rom_start) compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR); dbg("int15 entry = %p\n", compaq_int15_entry_point); - - /* initialize our int15 lock */ - spin_lock_init(&int15_lock); } diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c index db047284c291..9e3b27744305 100644 --- a/drivers/pci/hotplug/shpchp_hpc.c +++ b/drivers/pci/hotplug/shpchp_hpc.c @@ -174,11 +174,6 @@ static inline u8 shpc_readb(struct controller *ctrl, int reg) return readb(ctrl->creg + reg); } -static inline void shpc_writeb(struct controller *ctrl, int reg, u8 val) -{ - writeb(val, ctrl->creg + reg); -} - static inline u16 shpc_readw(struct controller *ctrl, int reg) { return readw(ctrl->creg + reg); |