Commit 35b7c87c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/hotplug' 

- Remove unused acpiphp_callback typedef (Chen Lin)

* pci/hotplug:
  PCI: acpiphp: Remove unused acpiphp_callback typedef
parents c3900329 fc235fcb

drivers/pci/hotplug/acpiphp.h

+0 −3
Original line number Diff line number Diff line
@@ -176,9 +176,6 @@ int acpiphp_unregister_attention(struct acpiphp_attention_info *info); 
int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot, unsigned int sun);

void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot);



/* acpiphp_glue.c */

typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data);



int acpiphp_enable_slot(struct acpiphp_slot *slot);

int acpiphp_disable_slot(struct acpiphp_slot *slot);

u8 acpiphp_get_power_status(struct acpiphp_slot *slot);