PCI: shpchp: Remove hpc_ops
PATCH 1/1 PCI: shpchp: Remove hpc_ops
hpc_ops struct is only used by shpchp, and it's unnecessary. This is explained in the TODO file: drivers/pci/hotplug/TODO.
Signed-off-by ngn <[email protected]>
--- drivers/pci/hotplug/shpchp.h | 38 +++++++-------- drivers/pci/hotplug/shpchp_core.c | 15 +++--- drivers/pci/hotplug/shpchp_ctrl.c | 79 +++++++++++++++---------------- drivers/pci/hotplug/shpchp_hpc.c | 63 ++++++++---------------- 4 files changed, 82 insertions(+), 113 deletions(-)
drivers/pci/hotplug/shpchp.h +17 -21
@@ -72,7 +72,6 @@ struct slot {u8 latch_save;u8 pwr_save;struct controller *ctrl; -const struct hpc_ops *hpc_ops;struct hotplug_slot hotplug_slot;struct list_head slot_list;struct delayed_work work;/* work for button event */
@@ -94,7 +93,6 @@ struct controller {int slot_num_inc;/* 1 or -1 */ struct pci_dev *pci_dev;struct list_head slot_list; -const struct hpc_ops *hpc_ops;wait_queue_head_t queue;/* sleep & wake process */ u8 slot_device_offset;u32 pcix_misc2_reg;/* for amd pogo errata */
@@ -300,24 +298,22 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)pci_write_config_dword (p_slot->ctrl->pci_dev,PCIX_MISCII_OFFSET , pcix_misc2_temp); } -struct hpc_ops { -int (*power_on_slot)(struct slot *slot); -int (*slot_enable)(struct slot *slot); -int (*slot_disable)(struct slot *slot); -int (*set_bus_speed_mode)(struct slot *slot,enum pci_bus_speed speed); -int (*get_power_status)(struct slot *slot,u8 *status); -int (*get_attention_status)(struct slot *slot,u8 *status); -int (*set_attention_status)(struct slot *slot,u8 status); -int (*get_latch_status)(struct slot *slot,u8 *status); -int (*get_adapter_status)(struct slot *slot,u8 *status); -int (*get_adapter_speed)(struct slot *slot,enum pci_bus_speed *speed); -int (*get_prog_int)(struct slot *slot,u8 *prog_int); -int (*query_power_fault)(struct slot *slot); -void (*green_led_on)(struct slot *slot); -void (*green_led_off)(struct slot *slot); -void (*green_led_blink)(struct slot *slot); -void (*release_ctlr)(struct controller *ctrl); -int (*check_cmd_status)(struct controller *ctrl); -}; +int shpchp_power_on_slot (struct slot *slot); +int shpchp_slot_enable (struct slot *slot); +int shpchp_slot_disable (struct slot *slot); +int shpchp_set_bus_speed_mode (struct slot *slot,enum pci_bus_speed speed); +int shpchp_get_power_status (struct slot *slot,u8 *status); +int shpchp_get_attention_status (struct slot *slot,u8 *status); +int shpchp_set_attention_status (struct slot *slot,u8 status); +int shpchp_get_latch_status (struct slot *slot,u8 *status); +int shpchp_get_adapter_status (struct slot *slot,u8 *status); +int shpchp_get_adapter_speed (struct slot *slot,enum pci_bus_speed *speed); +int shpchp_get_prog_int (struct slot *slot,u8 *prog_int); +int shpchp_query_power_fault (struct slot *slot); +void shpchp_green_led_on (struct slot *slot); +void shpchp_green_led_off (struct slot *slot); +void shpchp_green_led_blink (struct slot *slot); +void shpchp_release_ctlr (struct controller *ctrl); +int shpchp_check_cmd_status (struct controller *ctrl);#endif /* _SHPCHP_H */
drivers/pci/hotplug/shpchp_core.c +7 -8
@@ -81,7 +81,6 @@ static int init_slots(struct controller *ctrl) slot->ctrl = ctrl; slot->bus = ctrl->pci_dev->subordinate->number; slot->device = ctrl->slot_device_offset + i; - slot->hpc_ops = ctrl->hpc_ops; slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i); slot->wq =alloc_workqueue ("shpchp-%d" ,0 ,0 , slot->number);
@@ -150,7 +149,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status) __func__, slot_name(slot)); slot->attention_save = status; - slot->hpc_ops->set_attention_status (slot, status); +shpchp_set_attention_status (slot, status);return 0 ; }
@@ -183,7 +182,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)ctrl_dbg (slot->ctrl,"%s: physical_slot = %s\n" , __func__,slot_name (slot)); - retval = slot->hpc_ops->get_power_status (slot, value); + retval =shpchp_get_power_status (slot, value);if (retval <0 ) *value = slot->pwr_save;
@@ -198,7 +197,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)ctrl_dbg (slot->ctrl,"%s: physical_slot = %s\n" , __func__,slot_name (slot)); - retval = slot->hpc_ops->get_attention_status (slot, value); + retval =shpchp_get_attention_status (slot, value);if (retval <0 ) *value = slot->attention_save;
@@ -213,7 +212,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)ctrl_dbg (slot->ctrl,"%s: physical_slot = %s\n" , __func__,slot_name (slot)); - retval = slot->hpc_ops->get_latch_status (slot, value); + retval =shpchp_get_latch_status (slot, value);if (retval <0 ) *value = slot->latch_save;
@@ -228,7 +227,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)ctrl_dbg (slot->ctrl,"%s: physical_slot = %s\n" , __func__,slot_name (slot)); - retval = slot->hpc_ops->get_adapter_status (slot, value); + retval =shpchp_get_adapter_status (slot, value);if (retval <0 ) *value = slot->presence_save;
@@ -293,7 +292,7 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err_cleanup_slots:cleanup_slots (ctrl); err_out_release_ctlr: - ctrl->hpc_ops->release_ctlr (ctrl); +shpchp_release_ctlr (ctrl); err_out_free_ctrl:kfree (ctrl); err_out_none:
@@ -306,7 +305,7 @@ static void shpc_remove(struct pci_dev *dev) dev->shpc_managed =0 ;shpchp_remove_ctrl_files (ctrl); - ctrl->hpc_ops->release_ctlr (ctrl); +shpchp_release_ctlr (ctrl);kfree (ctrl); }
drivers/pci/hotplug/shpchp_ctrl.c +39 -40
240 lines not on this page · raw message
drivers/pci/hotplug/shpchp_hpc.c +19 -44
189 lines not on this page · raw message
Signature · 1 line
2.45.2