[PATCH 92/99] cw1200: Fixing checkpatch warnings.

[Dmitry Tarnyagin]

---
 drivers/staging/cw1200/cw1200_sdio.c |    2 +-
 drivers/staging/cw1200/pm.c          |    2 +-
 drivers/staging/cw1200/sta.c         |    7 +++++--
 drivers/staging/cw1200/wsm.c         |    2 +-
 drivers/staging/cw1200/wsm.h         |    2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/cw1200/cw1200_sdio.c b/drivers/staging/cw1200/cw1200_sdio.c
index c5de6db..4b9d622 100644
--- a/drivers/staging/cw1200/cw1200_sdio.c
+++ b/drivers/staging/cw1200/cw1200_sdio.c
@@ -263,7 +263,7 @@ static int cw1200_sdio_on(const struct cw1200_platform_data *pdata)
 	/* A valid reset shall be obtained by maintaining WRESETN
 	 * active (low) for at least two cycles of LP_CLK after VDDIO
 	 * is stable within it operating range. */
-	msleep(1);
+	usleep_range(1000, 20000);
 	gpio_set_value(reset->start, 1);
 	/* The host should wait 32 ms after the WRESETN release
 	 * for the on-chip LDO to stabilize */
diff --git a/drivers/staging/cw1200/pm.c b/drivers/staging/cw1200/pm.c
index 0497031..f542e7d 100644
--- a/drivers/staging/cw1200/pm.c
+++ b/drivers/staging/cw1200/pm.c
@@ -118,7 +118,7 @@ static int cw1200_pm_init_common(struct cw1200_pm_state *pm,
 	pm->pm_dev = platform_device_alloc("cw1200_power", 0);
 	if (!pm->pm_dev) {
 		platform_driver_unregister(&cw1200_power_driver);
-		return ENOMEM;
+		return -ENOMEM;
 	}
 
 	pm->pm_dev->dev.platform_data = priv;
diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c
index 7d31378..25d414c 100644
--- a/drivers/staging/cw1200/sta.c
+++ b/drivers/staging/cw1200/sta.c
@@ -1120,13 +1120,13 @@ static int cw1200_parse_SDD_file(struct cw1200_common *priv)
 	} *pElement;
 	int parsedLength = 0;
 	#define SDD_PTA_CFG_ELT_ID 0xEB
-	#define FIELD_OFFSET(type, field) ((u8 *)&((type*)0)->field - (u8 *)0)
+	#define FIELD_OFFSET(type, field) ((u8 *)&((type *)0)->field - (u8 *)0)
 
 	priv->is_BT_Present = false;
 
 	pElement = (struct cw1200_sdd *)sdd_data;
 
-	pElement = (struct cw1200_sdd *)((u8*)pElement +
+	pElement = (struct cw1200_sdd *)((u8 *)pElement +
 		FIELD_OFFSET(struct cw1200_sdd, data) + pElement->length);
 
 	parsedLength += (FIELD_OFFSET(struct cw1200_sdd, data) +
@@ -1161,6 +1161,9 @@ static int cw1200_parse_SDD_file(struct cw1200_common *priv)
 		priv->conf_listen_interval = 0;
 	}
 	return 0;
+
+	#undef SDD_PTA_CFG_ELT_ID
+	#undef FIELD_OFFSET
 }
 
 
diff --git a/drivers/staging/cw1200/wsm.c b/drivers/staging/cw1200/wsm.c
index 245a640..21df2bf 100644
--- a/drivers/staging/cw1200/wsm.c
+++ b/drivers/staging/cw1200/wsm.c
@@ -1158,7 +1158,7 @@ int wsm_handle_exception(struct cw1200_common *priv, u8 *data, size_t len)
 	char fname[48];
 	size_t i;
 
-	static const char *reason_str[] = {
+	static const char * const reason_str[] = {
 		"undefined instruction",
 		"prefetch abort",
 		"data abort",
diff --git a/drivers/staging/cw1200/wsm.h b/drivers/staging/cw1200/wsm.h
index 4f7360d..9c66c1a 100644
--- a/drivers/staging/cw1200/wsm.h
+++ b/drivers/staging/cw1200/wsm.h
@@ -1771,7 +1771,7 @@ void wsm_unlock_tx(struct cw1200_common *priv);
 /* ******************************************************************** */
 /* WSM / BH API								*/
 
-int wsm_handle_exception(struct cw1200_common *priv, u8 * data, size_t len);
+int wsm_handle_exception(struct cw1200_common *priv, u8 *data, size_t len);
 int wsm_handle_rx(struct cw1200_common *priv, int id, struct wsm_hdr *wsm,
 		  struct sk_buff **skb_p);
 
-- 
1.7.8.3