From b3425fd9a367f6d8273ce812d8a04d636ccf6bdb Mon Sep 17 00:00:00 2001 From: Johan Meiring Date: Fri, 30 Nov 2012 18:58:51 +0200 Subject: [PATCH] --- yaml --- r: 353863 b: refs/heads/master c: ac6cf1b8e427068860cf4903215b2e9296e7c981 h: refs/heads/master i: 353861: 3e97f7a35b23a26662bb346f46c8c9af8e6805cb 353859: 4978f062639a4ef8c36f835ccc067629c9b8286d 353855: e866539bdbfb5ffc0884d75657abe8c1927b6b6a v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlags49_h2/wl_priv.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 348e4e7e6589..e27b21107691 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c54a639086b981c606bb2407f61bd880b70a96d5 +refs/heads/master: ac6cf1b8e427068860cf4903215b2e9296e7c981 diff --git a/trunk/drivers/staging/wlags49_h2/wl_priv.c b/trunk/drivers/staging/wlags49_h2/wl_priv.c index e2615a1cfa65..093e1eaa925e 100644 --- a/trunk/drivers/staging/wlags49_h2/wl_priv.c +++ b/trunk/drivers/staging/wlags49_h2/wl_priv.c @@ -136,27 +136,27 @@ int wvlan_uil(struct uilreq *urq, struct wl_private *lp) DBG_ENTER(DbgInfo); switch (urq->command) { - case UIL_FUN_CONNECT: + case UIL_FUN_CONNECT: DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_CONNECT\n"); ioctl_ret = wvlan_uil_connect(urq, lp); break; - case UIL_FUN_DISCONNECT: + case UIL_FUN_DISCONNECT: DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_DISCONNECT\n"); ioctl_ret = wvlan_uil_disconnect(urq, lp); break; - case UIL_FUN_ACTION: + case UIL_FUN_ACTION: DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_ACTION\n"); ioctl_ret = wvlan_uil_action(urq, lp); break; - case UIL_FUN_SEND_DIAG_MSG: + case UIL_FUN_SEND_DIAG_MSG: DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_SEND_DIAG_MSG\n"); ioctl_ret = wvlan_uil_send_diag_msg(urq, lp); break; - case UIL_FUN_GET_INFO: + case UIL_FUN_GET_INFO: DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_GET_INFO\n"); ioctl_ret = wvlan_uil_get_info(urq, lp); break; - case UIL_FUN_PUT_INFO: + case UIL_FUN_PUT_INFO: DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_PUT_INFO\n"); ioctl_ret = wvlan_uil_put_info(urq, lp); break; @@ -2047,22 +2047,22 @@ int wvlan_rts(struct rtsreq *rrq, __u32 io_base) DBG_PRINT("io_base: 0x%08x\n", io_base); switch (rrq->typ) { - case WL_IOCTL_RTS_READ: + case WL_IOCTL_RTS_READ: DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_RTS -- WL_IOCTL_RTS_READ\n"); rrq->data[0] = IN_PORT_WORD(io_base + rrq->reg); DBG_TRACE(DbgInfo, " reg 0x%04x ==> 0x%04x\n", rrq->reg, CNV_LITTLE_TO_SHORT(rrq->data[0])); break; - case WL_IOCTL_RTS_WRITE: + case WL_IOCTL_RTS_WRITE: DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_RTS -- WL_IOCTL_RTS_WRITE\n"); OUT_PORT_WORD(io_base + rrq->reg, rrq->data[0]); DBG_TRACE(DbgInfo, " reg 0x%04x <== 0x%04x\n", rrq->reg, CNV_LITTLE_TO_SHORT(rrq->data[0])); break; - case WL_IOCTL_RTS_BATCH_READ: + case WL_IOCTL_RTS_BATCH_READ: DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_RTS -- WL_IOCTL_RTS_BATCH_READ\n"); IN_PORT_STRING_16(io_base + rrq->reg, rrq->data, rrq->len); DBG_TRACE(DbgInfo, " reg 0x%04x ==> %d bytes\n", rrq->reg, rrq->len * sizeof(__u16)); break; - case WL_IOCTL_RTS_BATCH_WRITE: + case WL_IOCTL_RTS_BATCH_WRITE: DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_RTS -- WL_IOCTL_RTS_BATCH_WRITE\n"); OUT_PORT_STRING_16(io_base + rrq->reg, rrq->data, rrq->len); DBG_TRACE(DbgInfo, " reg 0x%04x <== %d bytes\n", rrq->reg, rrq->len * sizeof(__u16));