[PATCH] shpchp: Cleanup improper info messages

[powerpc.git] / drivers / pci / hotplug / shpchp.h

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index dd44951..7208b95 100644 (file)
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -82,7 +82,6 @@ struct event_info {
 };
 
 struct controller {
-       struct list_head ctrl_list;
        struct mutex crit_sect;         /* critical section mutex */
        struct mutex cmd_lock;          /* command lock */
        struct php_ctlr_state_s *hpc_ctlr_handle; /* HPC controller handle */
@@ -107,12 +106,6 @@ struct controller {
        volatile int cmd_busy;
 };
 
-struct hotplug_params {
-       u8      cache_line_size;
-       u8      latency_timer;
-       u8      enable_serr;
-       u8      enable_perr;
-};
 
 /* Define AMD SHPC ID  */
 #define PCI_DEVICE_ID_AMD_GOLAM_7450   0x7450 
@@ -175,9 +168,9 @@ struct hotplug_params {
  * error Messages
  */
 #define msg_initialization_err "Initialization failure, error=%d\n"
-#define msg_button_on          "PCI slot #%d - powering on due to button press.\n"
-#define msg_button_off         "PCI slot #%d - powering off due to button press.\n"
-#define msg_button_cancel      "PCI slot #%d - action canceled due to button press.\n"
+#define msg_button_on          "PCI slot #%s - powering on due to button press.\n"
+#define msg_button_off         "PCI slot #%s - powering off due to button press.\n"
+#define msg_button_cancel      "PCI slot #%s - action canceled due to button press.\n"
 
 /* sysfs functions for the hotplug controller info */
 extern void shpchp_create_ctrl_files   (struct controller *ctrl);
@@ -194,17 +187,28 @@ extern u8 shpchp_handle_power_fault(u8 hp_slot, void *inst_id);
 extern int     shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num);
 extern int     shpchp_configure_device(struct slot *p_slot);
 extern int     shpchp_unconfigure_device(struct slot *p_slot);
-extern void    get_hp_hw_control_from_firmware(struct pci_dev *dev);
-extern void    get_hp_params_from_firmware(struct pci_dev *dev,
-               struct hotplug_params *hpp);
-extern int     shpchprm_get_physical_slot_number(struct controller *ctrl,
-               u32 *sun, u8 busnum, u8 devnum);
 extern void    shpchp_remove_ctrl_files(struct controller *ctrl);
 extern void    cleanup_slots(struct controller *ctrl);
 extern void    queue_pushbutton_work(void *data);
 
-/* Global variables */
-extern struct list_head shpchp_ctrl_list;
+
+#ifdef CONFIG_ACPI
+static inline int get_hp_params_from_firmware(struct pci_dev *dev,
+                       struct hotplug_params *hpp)
+{
+       if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev->bus, hpp)))
+                       return -ENODEV;
+       return 0;
+}
+#define get_hp_hw_control_from_firmware(pdev) \
+       do { \
+               if (DEVICE_ACPI_HANDLE(&(pdev->dev))) \
+                       acpi_run_oshp(DEVICE_ACPI_HANDLE(&(pdev->dev))); \
+       } while (0)
+#else
+#define get_hp_params_from_firmware(dev, hpp) (-ENODEV)
+#define get_hp_hw_control_from_firmware(dev) do { } while (0)
+#endif
 
 struct ctrl_reg {
        volatile u32 base_offset;