PCI: PM: Drop struct pci_platform_pm_ops

After previous changes there are no more users of struct
pci_platform_pm_ops in the tree, so drop it along with all of the
remaining related code.

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Ferry Toth <fntoth@gmail.com>

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 925f275daa54546ef35682c6277dc7b17350da35..e61e5f956306c91bc1abf5cac92f977d8a1b880d 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -972,17 +972,6 @@ static void pci_restore_bars(struct pci_dev *dev)
                pci_update_resource(dev, i);
 }
 
-static const struct pci_platform_pm_ops *pci_platform_pm;
-
-int pci_set_platform_pm(const struct pci_platform_pm_ops *ops)
-{
-       if (!ops->is_manageable || !ops->set_state  || !ops->get_state ||
-           !ops->choose_state  || !ops->set_wakeup || !ops->need_resume)
-               return -EINVAL;
-       pci_platform_pm = ops;
-       return 0;
-}
-
 static inline bool platform_pci_power_manageable(struct pci_dev *dev)
 {
        if (pci_use_mid_pm())

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index e6fc14d87a0742f9ef3796be58baab41440aa144..bd39098c57dad1b71eb8745331fa3a5c4ad9a1ff 100644 (file)
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -63,45 +63,6 @@ struct pci_cap_saved_state *pci_find_saved_ext_cap(struct pci_dev *dev,
 #define PCI_PM_D3HOT_WAIT       10     /* msec */
 #define PCI_PM_D3COLD_WAIT      100    /* msec */
 
-/**
- * struct pci_platform_pm_ops - Firmware PM callbacks
- *
- * @bridge_d3: Does the bridge allow entering into D3
- *
- * @is_manageable: returns 'true' if given device is power manageable by the
- *                platform firmware
- *
- * @set_state: invokes the platform firmware to set the device's power state
- *
- * @get_state: queries the platform firmware for a device's current power state
- *
- * @refresh_state: asks the platform to refresh the device's power state data
- *
- * @choose_state: returns PCI power state of given device preferred by the
- *               platform; to be used during system-wide transitions from a
- *               sleeping state to the working state and vice versa
- *
- * @set_wakeup: enables/disables wakeup capability for the device
- *
- * @need_resume: returns 'true' if the given device (which is currently
- *              suspended) needs to be resumed to be configured for system
- *              wakeup.
- *
- * If given platform is generally capable of power managing PCI devices, all of
- * these callbacks are mandatory.
- */
-struct pci_platform_pm_ops {
-       bool (*bridge_d3)(struct pci_dev *dev);
-       bool (*is_manageable)(struct pci_dev *dev);
-       int (*set_state)(struct pci_dev *dev, pci_power_t state);
-       pci_power_t (*get_state)(struct pci_dev *dev);
-       void (*refresh_state)(struct pci_dev *dev);
-       pci_power_t (*choose_state)(struct pci_dev *dev);
-       int (*set_wakeup)(struct pci_dev *dev, bool enable);
-       bool (*need_resume)(struct pci_dev *dev);
-};
-
-int pci_set_platform_pm(const struct pci_platform_pm_ops *ops);
 void pci_update_current_state(struct pci_dev *dev, pci_power_t state);
 void pci_refresh_power_state(struct pci_dev *dev);
 int pci_power_up(struct pci_dev *dev);