From 9826d70df71c77879fb4ee8cde21e994d2d1bc98 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Mon, 18 Aug 2014 17:34:56 +0300 Subject: [PATCH] Removed support for special power management features These features are not used by OFED components. Signed-off-by: Vladimir Sokolovsky --- compat/compat-2.6.34.c | 20 -------------------- compat/compat-2.6.34.h | 20 -------------------- compat/main.c | 2 -- include/linux/compat-2.6.34.h | 16 ---------------- 4 files changed, 58 deletions(-) delete mode 100644 compat/compat-2.6.34.h diff --git a/compat/compat-2.6.34.c b/compat/compat-2.6.34.c index 0dfe716..4639e2e 100644 --- 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 #include #include -#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 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 - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)) - -#include - -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 af3717c..9ff2898 100644 --- a/compat/main.c +++ b/compat/main.c @@ -1,5 +1,4 @@ #include -#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 e644562..7fba70b 100644 --- a/include/linux/compat-2.6.34.h +++ b/include/linux/compat-2.6.34.h @@ -7,22 +7,6 @@ #include #include -#include - -/* - * 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) -- 2.41.0