PCI: Make current and maximum bus speeds part of the PCI core
Move the max_bus_speed and cur_bus_speed into the pci_bus. Expose the values through the PCI slot driver instead of the hotplug slot driver. Update all the hotplug drivers to use the pci_bus instead of their own data structures. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:

committed by
Jesse Barnes

parent
536c8cb49e
commit
3749c51ac6
@@ -63,12 +63,6 @@ enum pcie_link_width {
|
||||
* @get_adapter_status: Called to get see if an adapter is present in the slot or not.
|
||||
* If this field is NULL, the value passed in the struct hotplug_slot_info
|
||||
* will be used when this value is requested by a user.
|
||||
* @get_max_bus_speed: Called to get the max bus speed for a slot.
|
||||
* If this field is NULL, the value passed in the struct hotplug_slot_info
|
||||
* will be used when this value is requested by a user.
|
||||
* @get_cur_bus_speed: Called to get the current bus speed for a slot.
|
||||
* If this field is NULL, the value passed in the struct hotplug_slot_info
|
||||
* will be used when this value is requested by a user.
|
||||
*
|
||||
* The table of function pointers that is passed to the hotplug pci core by a
|
||||
* hotplug pci driver. These functions are called by the hotplug pci core when
|
||||
@@ -86,17 +80,14 @@ struct hotplug_slot_ops {
|
||||
int (*get_attention_status) (struct hotplug_slot *slot, u8 *value);
|
||||
int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
|
||||
int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
|
||||
int (*get_max_bus_speed) (struct hotplug_slot *slot, enum pci_bus_speed *value);
|
||||
int (*get_cur_bus_speed) (struct hotplug_slot *slot, enum pci_bus_speed *value);
|
||||
};
|
||||
|
||||
/**
|
||||
* struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
|
||||
* @power: if power is enabled or not (1/0)
|
||||
* @power_status: if power is enabled or not (1/0)
|
||||
* @attention_status: if the attention light is enabled or not (1/0)
|
||||
* @latch_status: if the latch (if any) is open or closed (1/0)
|
||||
* @adapter_present: if there is a pci board present in the slot or not (1/0)
|
||||
* @address: (domain << 16 | bus << 8 | dev)
|
||||
* @adapter_status: if there is a pci board present in the slot or not (1/0)
|
||||
*
|
||||
* Used to notify the hotplug pci core of the status of a specific slot.
|
||||
*/
|
||||
@@ -105,8 +96,6 @@ struct hotplug_slot_info {
|
||||
u8 attention_status;
|
||||
u8 latch_status;
|
||||
u8 adapter_status;
|
||||
enum pci_bus_speed max_bus_speed;
|
||||
enum pci_bus_speed cur_bus_speed;
|
||||
};
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user