[PATCH] staging: rtl8723au: core: fixing "foo * bar" should be "foo *bar"

2014-12-16 Thread Asaf Vertz
Fixed a coding style error, "foo * bar" should be "foo *bar"

Signed-off-by: Asaf Vertz 
---
 drivers/staging/rtl8723au/core/rtw_efuse.c |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_efuse.c 
b/drivers/staging/rtl8723au/core/rtw_efuse.c
index 81960e7..0e64d12 100644
--- a/drivers/staging/rtl8723au/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723au/core/rtw_efuse.c
@@ -328,12 +328,12 @@ EFUSE_Read1Byte23a(struct rtw_adapter *Adapter, u16 
Address)
 
 void
 EFUSE_Write1Byte(
-   struct rtw_adapter *Adapter,
+   struct rtw_adapter *Adapter,
u16 Address,
u8  Value);
 void
 EFUSE_Write1Byte(
-   struct rtw_adapter *Adapter,
+   struct rtw_adapter *Adapter,
u16 Address,
u8  Value)
 {
@@ -636,7 +636,7 @@ Efuse_ReadAllMap(struct rtw_adapter *pAdapter, u8 
efuseType, u8 *Efuse)
  *---*/
 static void
 efuse_ShadowRead1Byte(
-   struct rtw_adapter *pAdapter,
+   struct rtw_adapter *pAdapter,
u16 Offset,
u8  *Value)
 {
@@ -648,7 +648,7 @@ efuse_ShadowRead1Byte(
 /* Read Two Bytes */
 static void
 efuse_ShadowRead2Byte(
-   struct rtw_adapter *pAdapter,
+   struct rtw_adapter *pAdapter,
u16 Offset,
u16 *Value)
 {
@@ -661,7 +661,7 @@ efuse_ShadowRead2Byte(
 /* Read Four Bytes */
 static void
 efuse_ShadowRead4Byte(
-   struct rtw_adapter *pAdapter,
+   struct rtw_adapter *pAdapter,
u16 Offset,
u32 *Value)
 {
@@ -723,7 +723,7 @@ void EFUSE_ShadowMapUpdate23a(struct rtw_adapter *pAdapter, 
u8 efuseType)
  *---*/
 void
 EFUSE_ShadowRead23a(
-   struct rtw_adapter *pAdapter,
+   struct rtw_adapter *pAdapter,
u8  Type,
u16 Offset,
u32 *Value)
-- 
1.7.0.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH v2] staging: rtl8723au: core: fixing "foo * bar" should be "foo *bar"

2014-12-16 Thread Asaf Vertz
Fixed a coding style error, "foo * bar" should be "foo *bar"

Signed-off-by: Asaf Vertz 
---
Changes in v2:
  - fix ugly multiline arguments to the functions

 drivers/staging/rtl8723au/core/rtw_efuse.c |   32 ++-
 1 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_efuse.c 
b/drivers/staging/rtl8723au/core/rtw_efuse.c
index 81960e7..a6deddc 100644
--- a/drivers/staging/rtl8723au/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723au/core/rtw_efuse.c
@@ -327,15 +327,9 @@ EFUSE_Read1Byte23a(struct rtw_adapter *Adapter, u16 
Address)
  *---*/
 
 void
-EFUSE_Write1Byte(
-   struct rtw_adapter *Adapter,
-   u16 Address,
-   u8  Value);
+EFUSE_Write1Byte(struct rtw_adapter *Adapter, u16 Address, u8 Value);
 void
-EFUSE_Write1Byte(
-   struct rtw_adapter *Adapter,
-   u16 Address,
-   u8  Value)
+EFUSE_Write1Byte(struct rtw_adapter *Adapter, u16 Address, u8 Value)
 {
u8  Bytetemp = {0x00};
u8  temp = {0x00};
@@ -635,10 +629,7 @@ Efuse_ReadAllMap(struct rtw_adapter *pAdapter, u8 
efuseType, u8 *Efuse)
  *
  *---*/
 static void
-efuse_ShadowRead1Byte(
-   struct rtw_adapter *pAdapter,
-   u16 Offset,
-   u8  *Value)
+efuse_ShadowRead1Byte(struct rtw_adapter *pAdapter, u16 Offset, u8 *Value)
 {
struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
 
@@ -647,10 +638,7 @@ efuse_ShadowRead1Byte(
 
 /* Read Two Bytes */
 static void
-efuse_ShadowRead2Byte(
-   struct rtw_adapter *pAdapter,
-   u16 Offset,
-   u16 *Value)
+efuse_ShadowRead2Byte(struct rtw_adapter *pAdapter, u16 Offset, u16 *Value)
 {
struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
 
@@ -660,10 +648,7 @@ efuse_ShadowRead2Byte(
 
 /* Read Four Bytes */
 static void
-efuse_ShadowRead4Byte(
-   struct rtw_adapter *pAdapter,
-   u16 Offset,
-   u32 *Value)
+efuse_ShadowRead4Byte(struct rtw_adapter *pAdapter, u16 Offset, u32 *Value)
 {
struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
 
@@ -722,11 +707,8 @@ void EFUSE_ShadowMapUpdate23a(struct rtw_adapter 
*pAdapter, u8 efuseType)
  *
  *---*/
 void
-EFUSE_ShadowRead23a(
-   struct rtw_adapter *pAdapter,
-   u8  Type,
-   u16 Offset,
-   u32 *Value)
+EFUSE_ShadowRead23a(struct rtw_adapter *pAdapter,
+   u8 Type, u16 Offset, u32 *Value)
 {
if (Type == 1)
efuse_ShadowRead1Byte(pAdapter, Offset, (u8 *)Value);
-- 
1.7.0.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: wlan-ng: hfa384x_usb: fix sparse endianness warnings

2015-01-17 Thread Asaf Vertz
Fixed the following warnings (reported by sparse):
drivers/staging/wlan-ng/hfa384x_usb.c:3828:36: warning: cast to restricted 
__le16
drivers/staging/wlan-ng/hfa384x_usb.c:3229:16: warning: cast to restricted 
__le16
drivers/staging/wlan-ng/hfa384x_usb.c:3430:18: warning: cast to restricted 
__le16
drivers/staging/wlan-ng/hfa384x_usb.c:3349:51: warning: restricted __le16 
degrades to integer
drivers/staging/wlan-ng/hfa384x_usb.c:3357:37: warning: cast to restricted 
__le16
drivers/staging/wlan-ng/hfa384x_usb.c:3358:37: warning: cast to restricted 
__le16
drivers/staging/wlan-ng/hfa384x_usb.c:3393:36: warning: cast to restricted 
__le16
drivers/staging/wlan-ng/hfa384x_usb.c:3102:28: warning: cast to restricted 
__le16
drivers/staging/wlan-ng/hfa384x_usb.c:3004:28: warning: cast to restricted 
__le16
drivers/staging/wlan-ng/hfa384x_usb.c:1308:37: warning: cast to restricted 
__le16
drivers/staging/wlan-ng/hfa384x_usb.c:2713:25: warning: incorrect type in 
assignment (different base types)
drivers/staging/wlan-ng/hfa384x_usb.c:2713:25:expected unsigned short 
[unsigned] [usertype] type
drivers/staging/wlan-ng/hfa384x_usb.c:2713:25:got restricted __le16 
[usertype] 

Signed-off-by: Asaf Vertz 
---
 drivers/staging/wlan-ng/hfa384x.h |4 ++--
 drivers/staging/wlan-ng/hfa384x_usb.c |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x.h 
b/drivers/staging/wlan-ng/hfa384x.h
index 20d146b..964a662 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -879,7 +879,7 @@ typedef struct hfa384x_usb_error {
 /* Unions for packaging all the known packet types together */
 
 typedef union hfa384x_usbout {
-   u16 type;
+   __le16 type;
hfa384x_usb_txfrm_t txfrm;
hfa384x_usb_cmdreq_t cmdreq;
hfa384x_usb_wridreq_t wridreq;
@@ -889,7 +889,7 @@ typedef union hfa384x_usbout {
 } __packed hfa384x_usbout_t;
 
 typedef union hfa384x_usbin {
-   u16 type;
+   __le16 type;
hfa384x_usb_rxfrm_t rxfrm;
hfa384x_usb_txfrm_t txfrm;
hfa384x_usb_infofrm_t infofrm;
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c 
b/drivers/staging/wlan-ng/hfa384x_usb.c
index 55d2f56..e84ebb9 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3346,7 +3346,7 @@ retry:
if (unlocked_usbctlx_cancel_async(hw, ctlx) == 0)
run_queue = 1;
} else {
-   const u16 intype = (usbin->type & ~cpu_to_le16(0x8000));
+   const __le16 intype = (usbin->type & ~cpu_to_le16(0x8000));
 
/*
 * Check that our message is what we're expecting ...
-- 
1.7.0.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: iio: ad5933: fix format string warnings

2015-01-19 Thread Asaf Vertz
Fixed the following warnings (reported by cppcheck):
[drivers/staging/iio/impedance-analyzer/ad5933.c:363]: (warning) %d in format 
string (no. 1)
requires 'int' but the argument type is 'unsigned int'.
[drivers/staging/iio/impedance-analyzer/ad5933.c:367]: (warning) %d in format 
string (no. 1)
requires 'int' but the argument type is 'unsigned int'.
[drivers/staging/iio/impedance-analyzer/ad5933.c:367]: (warning) %d in format 
string (no. 2)
requires 'int' but the argument type is 'unsigned int'.
[drivers/staging/iio/impedance-analyzer/ad5933.c:367]: (warning) %d in format 
string (no. 3)
requires 'int' but the argument type is 'unsigned int'.
[drivers/staging/iio/impedance-analyzer/ad5933.c:367]: (warning) %d in format 
string (no. 4)
requires 'int' but the argument type is 'unsigned int'.

Signed-off-by: Asaf Vertz 
---
 drivers/staging/iio/impedance-analyzer/ad5933.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c 
b/drivers/staging/iio/impedance-analyzer/ad5933.c
index b6bd609..4230a43 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -360,11 +360,11 @@ static ssize_t ad5933_show(struct device *dev,
mutex_lock(&indio_dev->mlock);
switch ((u32) this_attr->address) {
case AD5933_OUT_RANGE:
-   len = sprintf(buf, "%d\n",
+   len = sprintf(buf, "%u\n",
  st->range_avail[(st->ctrl_hb >> 1) & 0x3]);
break;
case AD5933_OUT_RANGE_AVAIL:
-   len = sprintf(buf, "%d %d %d %d\n", st->range_avail[0],
+   len = sprintf(buf, "%u %u %u %u\n", st->range_avail[0],
  st->range_avail[3], st->range_avail[2],
  st->range_avail[1]);
break;
-- 
1.7.0.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: iio: tsl2x7x_core: fix format string warnings

2015-01-20 Thread Asaf Vertz
Fixed the following warnings (reported by cppcheck):
[drivers/staging/iio/light/tsl2x7x_core.c:1150]: (warning) %d in format string 
(no. 1)
requires 'int' but the argument type is 'unsigned int'.
[drivers/staging/iio/light/tsl2x7x_core.c:1150]: (warning) %d in format string 
(no. 2)
requires 'int' but the argument type is 'unsigned int'.
[drivers/staging/iio/light/tsl2x7x_core.c:1150]: (warning) %d in format string 
(no. 3)
requires 'int' but the argument type is 'unsigned int'.

Signed-off-by: Asaf Vertz 
---
 drivers/staging/iio/light/tsl2x7x_core.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/iio/light/tsl2x7x_core.c 
b/drivers/staging/iio/light/tsl2x7x_core.c
index 423f96b..4a5dc26 100644
--- a/drivers/staging/iio/light/tsl2x7x_core.c
+++ b/drivers/staging/iio/light/tsl2x7x_core.c
@@ -1147,7 +1147,7 @@ static ssize_t tsl2x7x_luxtable_show(struct device *dev,
int offset = 0;
 
while (i < (TSL2X7X_MAX_LUX_TABLE_SIZE * 3)) {
-   offset += snprintf(buf + offset, PAGE_SIZE, "%d,%d,%d,",
+   offset += snprintf(buf + offset, PAGE_SIZE, "%u,%u,%u,",
chip->tsl2x7x_device_lux[i].ratio,
chip->tsl2x7x_device_lux[i].ch0,
chip->tsl2x7x_device_lux[i].ch1);
-- 
1.7.0.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: iio: tsl2583: fix format string warnings

2015-01-20 Thread Asaf Vertz
Fixed the following warnings (reported by cppcheck):
[drivers/staging/iio/light/tsl2583.c:695]: (warning) %d in format string (no. 1)
requires 'int' but the argument type is 'unsigned int'.
[drivers/staging/iio/light/tsl2583.c:695]: (warning) %d in format string (no. 2)
requires 'int' but the argument type is 'unsigned int'.
[drivers/staging/iio/light/tsl2583.c:695]: (warning) %d in format string (no. 3)
requires 'int' but the argument type is 'unsigned int'.

Signed-off-by: Asaf Vertz 
---
 drivers/staging/iio/light/tsl2583.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/iio/light/tsl2583.c 
b/drivers/staging/iio/light/tsl2583.c
index cc4ddcc..8afae8e 100644
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -692,7 +692,7 @@ static ssize_t taos_luxtable_show(struct device *dev,
int offset = 0;
 
for (i = 0; i < ARRAY_SIZE(taos_device_lux); i++) {
-   offset += sprintf(buf + offset, "%d,%d,%d,",
+   offset += sprintf(buf + offset, "%u,%u,%u,",
  taos_device_lux[i].ratio,
  taos_device_lux[i].ch0,
  taos_device_lux[i].ch1);
-- 
1.7.0.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: lustre: osc: fix space prohibited after that '!'

2015-02-01 Thread Asaf Vertz
Fixed a coding style error, space prohibited after that '!'

Signed-off-by: Asaf Vertz 
---
 drivers/staging/lustre/lustre/osc/osc_lock.c |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/lustre/lustre/osc/osc_lock.c 
b/drivers/staging/lustre/lustre/osc/osc_lock.c
index a7f08bc..4456557 100644
--- a/drivers/staging/lustre/lustre/osc/osc_lock.c
+++ b/drivers/staging/lustre/lustre/osc/osc_lock.c
@@ -100,14 +100,14 @@ static int osc_lock_invariant(struct osc_lock *ols)
/*
 * If all the following "ergo"s are true, return 1, otherwise 0
 */
-   if (! ergo(olock != NULL, handle_used))
+   if (!ergo(olock != NULL, handle_used))
return 0;
 
-   if (! ergo(olock != NULL,
+   if (!ergo(olock != NULL,
   olock->l_handle.h_cookie == ols->ols_handle.cookie))
return 0;
 
-   if (! ergo(handle_used,
+   if (!ergo(handle_used,
   ergo(lock != NULL && olock != NULL, lock == olock) &&
   ergo(lock == NULL, olock == NULL)))
return 0;
@@ -115,18 +115,18 @@ static int osc_lock_invariant(struct osc_lock *ols)
 * Check that ->ols_handle and ->ols_lock are consistent, but
 * take into account that they are set at the different time.
 */
-   if (! ergo(ols->ols_state == OLS_CANCELLED,
+   if (!ergo(ols->ols_state == OLS_CANCELLED,
   olock == NULL && !handle_used))
return 0;
/*
 * DLM lock is destroyed only after we have seen cancellation
 * ast.
 */
-   if (! ergo(olock != NULL && ols->ols_state < OLS_CANCELLED,
+   if (!ergo(olock != NULL && ols->ols_state < OLS_CANCELLED,
   ((olock->l_flags & LDLM_FL_DESTROYED) == 0)))
return 0;
 
-   if (! ergo(ols->ols_state == OLS_GRANTED,
+   if (!ergo(ols->ols_state == OLS_GRANTED,
   olock != NULL &&
   olock->l_req_mode == olock->l_granted_mode &&
   ols->ols_hold))
-- 
1.7.0.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: lustre: lnet: fix space prohibited before that '++'

2015-02-01 Thread Asaf Vertz
Fixed a coding style error, space prohibited before that '++'

Signed-off-by: Asaf Vertz 
---
 drivers/staging/lustre/lnet/selftest/console.c |   28 
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/lustre/lnet/selftest/console.c 
b/drivers/staging/lustre/lnet/selftest/console.c
index 3bb47fa..1e0afc2 100644
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -46,17 +46,17 @@
 #include "console.h"
 #include "conrpc.h"
 
-#define LST_NODE_STATE_COUNTER(nd, p) \
-do {   \
-   if ((nd)->nd_state == LST_NODE_ACTIVE)\
-   (p)->nle_nactive ++;\
+#define LST_NODE_STATE_COUNTER(nd, p)  \
+do {   \
+   if ((nd)->nd_state == LST_NODE_ACTIVE)  \
+   (p)->nle_nactive++; \
else if ((nd)->nd_state == LST_NODE_BUSY)   \
-   (p)->nle_nbusy ++;\
+   (p)->nle_nbusy++;   \
else if ((nd)->nd_state == LST_NODE_DOWN)   \
-   (p)->nle_ndown ++;\
-   else\
-   (p)->nle_nunknown ++;  \
-   (p)->nle_nnode ++;\
+   (p)->nle_ndown++;   \
+   else\
+   (p)->nle_nunknown++;\
+   (p)->nle_nnode++;   \
 } while (0)
 
 lstcon_session_t   console_session;
@@ -223,7 +223,7 @@ lstcon_group_alloc(char *name, lstcon_group_t **grpp)
 static void
 lstcon_group_addref(lstcon_group_t *grp)
 {
-   grp->grp_ref ++;
+   grp->grp_ref++;
 }
 
 static void lstcon_group_ndlink_release(lstcon_group_t *, lstcon_ndlink_t *);
@@ -298,7 +298,7 @@ lstcon_group_ndlink_find(lstcon_group_t *grp, 
lnet_process_id_t id,
return 0;
 
list_add_tail(&(*ndlpp)->ndl_link, &grp->grp_ndl_list);
-   grp->grp_nnode ++;
+   grp->grp_nnode++;
 
return 0;
 }
@@ -324,7 +324,7 @@ lstcon_group_ndlink_move(lstcon_group_t *old,
 
list_add_tail(&ndl->ndl_hlink, &new->grp_ndl_hash[idx]);
list_add_tail(&ndl->ndl_link, &new->grp_ndl_list);
-   new->grp_nnode ++;
+   new->grp_nnode++;
 
return;
 }
@@ -767,7 +767,7 @@ lstcon_nodes_getent(struct list_head *head, int *index_p,
 &nd->nd_state, sizeof(nd->nd_state)))
return -EFAULT;
 
-   count ++;
+   count++;
}
 
if (index <= *index_p)
@@ -1343,7 +1343,7 @@ lstcon_test_add(char *batch_name, int type, int loop,
/* add to test list anyway, so user can check what's going on */
list_add_tail(&test->tes_link, &batch->bat_test_list);
 
-   batch->bat_ntest ++;
+   batch->bat_ntest++;
test->tes_hdr.tsb_index = batch->bat_ntest;
 
/*  hold groups so nobody can change them */
-- 
1.7.0.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: lustre: use linux headers

2015-02-09 Thread Asaf Vertz
WARNING: Use #include  instead of 
WARNING: Use #include  instead of 
WARNING: Use #include  instead of 

Signed-off-by: Asaf Vertz 
---
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h|2 +-
 .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h  |2 +-
 .../lustre/lustre/libcfs/linux/linux-debug.c   |2 +-
 .../lustre/lustre/libcfs/linux/linux-prim.c|2 +-
 .../lustre/lustre/libcfs/linux/linux-proc.c|2 +-
 drivers/staging/lustre/lustre/llite/dir.c  |2 +-
 drivers/staging/lustre/lustre/llite/llite_mmap.c   |2 +-
 drivers/staging/lustre/lustre/llite/lloop.c|3 +--
 drivers/staging/lustre/lustre/llite/rw.c   |2 +-
 drivers/staging/lustre/lustre/llite/rw26.c |2 +-
 drivers/staging/lustre/lustre/lmv/lmv_obd.c|2 +-
 drivers/staging/lustre/lustre/lov/lproc_lov.c  |2 +-
 drivers/staging/lustre/lustre/osc/lproc_osc.c  |2 +-
 13 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h 
b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
index ab128de..cd664d0 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
@@ -46,8 +46,8 @@
 #include 
 #include 
 #include 
+#include 
 
-#include 
 #include 
 
 #include 
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h 
b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h
index 7a793d2..f556388 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h
@@ -50,8 +50,8 @@
 #include 
 #include 
 #include 
+#include 
 
-#include 
 #include 
 
 #include 
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c 
b/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
index 12005a7..4545d54 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
@@ -50,7 +50,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 # define DEBUG_SUBSYSTEM S_LNET
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c 
b/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c
index 19f405e..fde2819 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c
@@ -43,7 +43,7 @@
 #include "../../../include/linux/libcfs/libcfs.h"
 
 #if defined(CONFIG_KGDB)
-#include 
+#include 
 #endif
 
 /**
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c 
b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
index c539e37..0f65929 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/llite/dir.c 
b/drivers/staging/lustre/lustre/llite/dir.c
index babba60..e70d5bd 100644
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -41,7 +41,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include/* for wait_on_buffer */
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c 
b/drivers/staging/lustre/lustre/llite/llite_mmap.c
index 479bf42..ab07959 100644
--- a/drivers/staging/lustre/lustre/llite/llite_mmap.c
+++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c
@@ -40,7 +40,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/llite/lloop.c 
b/drivers/staging/lustre/lustre/llite/lloop.c
index 0312488..cec9254 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -100,8 +100,7 @@
 #include 
 #include 
 #include 
-
-#include 
+#include 
 
 #include "../include/lustre_lib.h"
 #include "../include/lustre_lite.h"
diff --git a/drivers/staging/lustre/lustre/llite/rw.c 
b/drivers/staging/lustre/lustre/llite/rw.c
index 10a0421..8884a43 100644
--- a/drivers/staging/lustre/lustre/llite/rw.c
+++ b/drivers/staging/lustre/lustre/llite/rw.c
@@ -45,7 +45,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/llite/rw26.c 
b/drivers/staging/lustre/lustre/llite/rw26.c
index 2f21304..91442fa 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -44,7 +44,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c 
b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index b779f47..403e9f5 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -43,7 +43,7 @@
 #include