diff options
| author | Alex Chiang <[email protected]> | 2008-10-20 23:41:33 +0000 |
|---|---|---|
| committer | Jesse Barnes <[email protected]> | 2008-10-22 23:42:41 +0000 |
| commit | a32615a1a661f83661e8a26c3bc7763f716da8f3 (patch) | |
| tree | 3c33e4fc205f184d2fbd135bd800e05182aa18c6 /drivers/pci/hotplug/ibmphp.h | |
| parent | PCI: fakephp: remove 'name' parameter (diff) | |
| download | kernel-a32615a1a661f83661e8a26c3bc7763f716da8f3.tar.gz kernel-a32615a1a661f83661e8a26c3bc7763f716da8f3.zip | |
PCI: ibmphp: stop managing hotplug_slot->name
We no longer need to manage our version of hotplug_slot->name
since the PCI and hotplug core manage it on our behalf.
Now, we simply advise the PCI core of the name that we would
like, and let the core take care of the rest.
Additionally, slightly rearrange the members of struct slot
so they are naturally aligned to eliminate holes.
Cc: [email protected]
Cc: [email protected]
Acked-by: Kenji Kaneshige <[email protected]>
Signed-off-by: Alex Chiang <[email protected]>
Signed-off-by: Jesse Barnes <[email protected]>
Diffstat (limited to 'drivers/pci/hotplug/ibmphp.h')
| -rw-r--r-- | drivers/pci/hotplug/ibmphp.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/ibmphp.h b/drivers/pci/hotplug/ibmphp.h index 612d96301509..a8d391a4957d 100644 --- a/drivers/pci/hotplug/ibmphp.h +++ b/drivers/pci/hotplug/ibmphp.h @@ -707,17 +707,16 @@ struct slot { u8 device; u8 number; u8 real_physical_slot_num; - char name[100]; u32 capabilities; u8 supported_speed; u8 supported_bus_mode; + u8 flag; /* this is for disable slot and polling */ + u8 ctlr_index; struct hotplug_slot *hotplug_slot; struct controller *ctrl; struct pci_func *func; u8 irq[4]; - u8 flag; /* this is for disable slot and polling */ int bit_mode; /* 0 = 32, 1 = 64 */ - u8 ctlr_index; struct bus_info *bus_on; struct list_head ibm_slot_list; u8 status; |