Removed support for special power management features

These features are not used by OFED components.

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/compat/compat-2.6.34.c b/compat/compat-2.6.34.c
index 0dfe716fd281026a6132d2dccfa2b6ed4f4f30ea..4639e2ec0d838ad1d3d895b093092dd7297b8831 100644 (file)
--- a/compat/compat-2.6.34.c
+++ b/compat/compat-2.6.34.c
@@ -8,29 +8,9 @@
  * Compatibility file for Linux wireless for kernels 2.6.34.
  */
 
-#include <linux/mmc/sdio_func.h>
 #include <linux/pci.h>
 #include <linux/export.h>
 
-#include "compat-2.6.34.h"
-
-static mmc_pm_flag_t backport_mmc_pm_flags;
-
-void backport_init_mmc_pm_flags(void)
-{
-       backport_mmc_pm_flags = 0;
-}
-
-mmc_pm_flag_t sdio_get_host_pm_caps(struct sdio_func *func)
-{
-       return backport_mmc_pm_flags;
-}
-
-int sdio_set_host_pm_flags(struct sdio_func *func, mmc_pm_flag_t flags)
-{
-       return -EINVAL;
-}
-
 int pci_vpd_find_tag(const u8 *buf, unsigned int off, unsigned int len, u8 rdt)
 {
        int i;

diff --git a/compat/compat-2.6.34.h b/compat/compat-2.6.34.h
deleted file mode 100644 (file)
index b36b441..0000000
--- a/compat/compat-2.6.34.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef LINUX_26_34_COMPAT_PRIVATE_H
-#define LINUX_26_34_COMPAT_PRIVATE_H
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34))
-
-#include <linux/mmc/sdio_func.h>
-
-void backport_init_mmc_pm_flags(void);
-
-#else /* Kernels >= 2.6.34 */
-
-static inline void backport_init_mmc_pm_flags(void)
-{
-}
-
-#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)) */
-
-#endif /* LINUX_26_34_COMPAT_PRIVATE_H */

diff --git a/compat/main.c b/compat/main.c
index af3717c0e9091ffe450425564d4e8a5e2f4613f3..9ff2898edc93fc7d351e1ec77611d84f192d65ad 100644 (file)
--- a/compat/main.c
+++ b/compat/main.c
@@ -1,5 +1,4 @@
 #include <linux/module.h>
-#include "compat-2.6.34.h"
 
 MODULE_AUTHOR("Luis R. Rodriguez");
 MODULE_DESCRIPTION("Kernel backport module");
@@ -58,7 +57,6 @@ static int __init backport_init(void)
                pr_warn("backport_system_workqueue_create() failed\n");
                return err;
        }
-       backport_init_mmc_pm_flags();
 
        printk(KERN_INFO
               COMPAT_PROJECT " backport release: "

diff --git a/include/linux/compat-2.6.34.h b/include/linux/compat-2.6.34.h
index e6445625675c8d98f1bca424643db13b4332c616..7fba70beaf8c119a13241a433686e7253351cc02 100644 (file)
--- a/include/linux/compat-2.6.34.h
+++ b/include/linux/compat-2.6.34.h
@@ -7,22 +7,6 @@
 
 #include <linux/netdevice.h>
 #include <linux/usb.h>
-#include <linux/mmc/sdio_func.h>
-
-/*
- * Backports da68c4eb25
- * sdio: introduce API for special power management features
- *
- * We wimply carry around the data structures and flags, and
- * make the host return no flags set by the driver.
- */
-typedef unsigned int mmc_pm_flag_t;
-
-#define MMC_PM_KEEP_POWER      (1 << 0)        /* preserve card power during suspend */
-#define MMC_PM_WAKE_SDIO_IRQ   (1 << 1)        /* wake up host system on SDIO IRQ assertion */
-
-extern mmc_pm_flag_t sdio_get_host_pm_caps(struct sdio_func *func);
-extern int sdio_set_host_pm_flags(struct sdio_func *func, mmc_pm_flag_t flags);
 
 #define netdev_uc_count(dev) ((dev)->uc.count)
 #define netdev_uc_empty(dev) ((dev)->uc.count == 0)