summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/cg2900/devices-cg2900.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/cg2900/devices-cg2900.c b/drivers/staging/cg2900/devices-cg2900.c
index 3c9f8e3e16f..567639d9e34 100644
--- a/drivers/staging/cg2900/devices-cg2900.c
+++ b/drivers/staging/cg2900/devices-cg2900.c
@@ -25,7 +25,6 @@
#include <linux/platform_device.h>
#include <linux/sched.h>
#include <linux/skbuff.h>
-#include <linux/spinlock.h>
#include <linux/string.h>
#include <linux/types.h>
#include <plat/pincfg.h>
@@ -46,7 +45,7 @@
#define CG2900_PG2_HCI_REV 0x0200
#define CG2900_PG1_SPECIAL_HCI_REV 0x0700
-#define CHIP_INITIAL_LOW_TIMEOUT 20 /* ms */
+#define CHIP_ENABLE_PDB_LOW_TIMEOUT 100 /* ms */
struct vs_power_sw_off_cmd {
__le16 op_code;
@@ -69,7 +68,6 @@ struct dcg2900_info {
u8 gpio_0_7_pull_down;
u8 gpio_8_15_pull_down;
u8 gpio_16_20_pull_down;
- spinlock_t pdb_toggle_lock;
struct regulator *regulator_wlan;
};
@@ -90,7 +88,7 @@ static void dcg2900_enable_chip(struct cg2900_chip_dev *dev)
*/
gpio_set_value(info->gbf_gpio, 0);
schedule_timeout_uninterruptible(msecs_to_jiffies(
- CHIP_INITIAL_LOW_TIMEOUT));
+ CHIP_ENABLE_PDB_LOW_TIMEOUT));
gpio_set_value(info->gbf_gpio, 1);
}
@@ -198,8 +196,6 @@ static int dcg2900_init(struct cg2900_chip_dev *dev)
return -ENOMEM;
}
- spin_lock_init(&info->pdb_toggle_lock);
-
if (!dev->pdev->num_resources) {
dev_dbg(dev->dev, "No resources available\n");
info->gbf_gpio = -1;