[PATCH 3/4] Staging:wilc1000:wilc_spi: Fixed spelling error
Fixed spelling error. 'unkmown' to 'unknown'.
Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com>
---
drivers/staging/wilc1000/wilc_spi.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_spi.c
b/drivers/staging/wilc1000/wilc_spi.c
index b48cb1c8..4f38922 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -963,12 +963,12 @@ static int wilc_spi_read_int(struct wilc *wilc, u32
*int_status)
}
{
- u32 unkmown_mask;
+ u32 unknown_mask;
- unkmown_mask = ~((1ul << g_spi.nint) -
1);
+ unknown_mask = ~((1ul << g_spi.nint) -
1);
- if ((tmp >> IRG_FLAGS_OFFSET) &
unkmown_mask) {
- dev_err(>dev, "Unexpected
interrupt (2): j=%d, tmp=%x, mask=%x\n", j, tmp, unkmown_mask);
+ if ((tmp >> IRG_FLAGS_OFFSET) &
unknown_mask) {
+ dev_err(>dev, "Unexpected
interrupt (2): j=%d, tmp=%x, mask=%x\n", j, tmp, unknown_mask);
happended = 1;
}
}
--
2.1.4
[PATCH 3/4] Staging:wilc1000:wilc_spi: Fixed spelling error
Fixed spelling error. 'unkmown' to 'unknown'.
Signed-off-by: Georgios Emmanouil
---
drivers/staging/wilc1000/wilc_spi.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_spi.c
b/drivers/staging/wilc1000/wilc_spi.c
index b48cb1c8..4f38922 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -963,12 +963,12 @@ static int wilc_spi_read_int(struct wilc *wilc, u32
*int_status)
}
{
- u32 unkmown_mask;
+ u32 unknown_mask;
- unkmown_mask = ~((1ul << g_spi.nint) -
1);
+ unknown_mask = ~((1ul << g_spi.nint) -
1);
- if ((tmp >> IRG_FLAGS_OFFSET) &
unkmown_mask) {
- dev_err(>dev, "Unexpected
interrupt (2): j=%d, tmp=%x, mask=%x\n", j, tmp, unkmown_mask);
+ if ((tmp >> IRG_FLAGS_OFFSET) &
unknown_mask) {
+ dev_err(>dev, "Unexpected
interrupt (2): j=%d, tmp=%x, mask=%x\n", j, tmp, unknown_mask);
happended = 1;
}
}
--
2.1.4
[PATCH 2/4] Staging:wilc1000:wilc_spi: Fixed alignment to match parenthesis
Fixed alignment to match parenthesis.
Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com>
---
drivers/staging/wilc1000/wilc_spi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wilc1000/wilc_spi.c
b/drivers/staging/wilc1000/wilc_spi.c
index 6bd4047..b48cb1c8 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -408,7 +408,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32
adr, u8 *b, u32 sz,
if (len2 > ARRAY_SIZE(wb)) {
dev_err(>dev, "spi buffer size too small (%d) (%zu)\n",
-len2, ARRAY_SIZE(wb));
+ len2, ARRAY_SIZE(wb));
return N_FAIL;
}
/* zero spi write buffers. */
--
2.1.4
[PATCH 2/4] Staging:wilc1000:wilc_spi: Fixed alignment to match parenthesis
Fixed alignment to match parenthesis.
Signed-off-by: Georgios Emmanouil
---
drivers/staging/wilc1000/wilc_spi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wilc1000/wilc_spi.c
b/drivers/staging/wilc1000/wilc_spi.c
index 6bd4047..b48cb1c8 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -408,7 +408,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32
adr, u8 *b, u32 sz,
if (len2 > ARRAY_SIZE(wb)) {
dev_err(>dev, "spi buffer size too small (%d) (%zu)\n",
-len2, ARRAY_SIZE(wb));
+ len2, ARRAY_SIZE(wb));
return N_FAIL;
}
/* zero spi write buffers. */
--
2.1.4
[PATCH 1/4] Staging:wilc1000:wilc_spi: Fixed comment style to the preferred kernel comment style
Fixed comment style to the preferred kernel comment style. Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com> --- drivers/staging/wilc1000/wilc_spi.c | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c index 55d53c3..6bd4047 100644 --- a/drivers/staging/wilc1000/wilc_spi.c +++ b/drivers/staging/wilc1000/wilc_spi.c @@ -1,11 +1,9 @@ -/* // */ -/* */ -/* Copyright (c) Atmel Corporation. All rights reserved. */ -/* */ -/* Module Name: wilc_spi.c */ -/* */ -/* */ -/* */ +/* + * Copyright (c) Atmel Corporation. All rights reserved. + * + * Module Name: wilc_spi.c + */ + #include #include #include -- 2.1.4
[PATCH 1/4] Staging:wilc1000:wilc_spi: Fixed comment style to the preferred kernel comment style
Fixed comment style to the preferred kernel comment style. Signed-off-by: Georgios Emmanouil --- drivers/staging/wilc1000/wilc_spi.c | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c index 55d53c3..6bd4047 100644 --- a/drivers/staging/wilc1000/wilc_spi.c +++ b/drivers/staging/wilc1000/wilc_spi.c @@ -1,11 +1,9 @@ -/* // */ -/* */ -/* Copyright (c) Atmel Corporation. All rights reserved. */ -/* */ -/* Module Name: wilc_spi.c */ -/* */ -/* */ -/* */ +/* + * Copyright (c) Atmel Corporation. All rights reserved. + * + * Module Name: wilc_spi.c + */ + #include #include #include -- 2.1.4
[PATCH 4/4] Staging:wilc1000:wilc_spi: Added blank line after function and modified comment style
Added blank line after function and modified comment style.
Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com>
---
drivers/staging/wilc1000/wilc_spi.c | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_spi.c
b/drivers/staging/wilc1000/wilc_spi.c
index 4f38922..33c2f7c 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -1128,11 +1128,8 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint)
return 1;
}
-/
- *
- * Global spi HIF function table
- *
- /
+
+/* Global spi HIF function table */
static const struct wilc_hif_func wilc_hif_spi = {
.hif_init = wilc_spi_init,
.hif_deinit = _wilc_spi_deinit,
--
2.1.4
[PATCH 4/4] Staging:wilc1000:wilc_spi: Added blank line after function and modified comment style
Added blank line after function and modified comment style.
Signed-off-by: Georgios Emmanouil
---
drivers/staging/wilc1000/wilc_spi.c | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_spi.c
b/drivers/staging/wilc1000/wilc_spi.c
index 4f38922..33c2f7c 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -1128,11 +1128,8 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint)
return 1;
}
-/
- *
- * Global spi HIF function table
- *
- /
+
+/* Global spi HIF function table */
static const struct wilc_hif_func wilc_hif_spi = {
.hif_init = wilc_spi_init,
.hif_deinit = _wilc_spi_deinit,
--
2.1.4
[PATCH 3/3] Staging:wilc1000:host_interface: Integrated two 'if' statements to a single 'if' statement
Removed unnecessary 'if' statement and integrated the condition to the
previous 'if' statement.
Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index bbe1a09..4936e80 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1355,13 +1355,11 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif
*vif,
} else {
strConnectInfo.status =
pstrConnectRespInfo->status;
- if (strConnectInfo.status ==
SUCCESSFUL_STATUSCODE) {
- if
(pstrConnectRespInfo->ies) {
-
strConnectInfo.resp_ies_len = pstrConnectRespInfo->ies_len;
-
strConnectInfo.resp_ies = kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL);
-
memcpy(strConnectInfo.resp_ies, pstrConnectRespInfo->ies,
-
pstrConnectRespInfo->ies_len);
- }
+ if (strConnectInfo.status ==
SUCCESSFUL_STATUSCODE && pstrConnectRespInfo->ies) {
+
strConnectInfo.resp_ies_len = pstrConnectRespInfo->ies_len;
+ strConnectInfo.resp_ies
= kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL);
+
memcpy(strConnectInfo.resp_ies, pstrConnectRespInfo->ies,
+
pstrConnectRespInfo->ies_len);
}
if (pstrConnectRespInfo) {
--
2.1.4
[PATCH 3/3] Staging:wilc1000:host_interface: Integrated two 'if' statements to a single 'if' statement
Removed unnecessary 'if' statement and integrated the condition to the
previous 'if' statement.
Signed-off-by: Georgios Emmanouil
---
drivers/staging/wilc1000/host_interface.c | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index bbe1a09..4936e80 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1355,13 +1355,11 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif
*vif,
} else {
strConnectInfo.status =
pstrConnectRespInfo->status;
- if (strConnectInfo.status ==
SUCCESSFUL_STATUSCODE) {
- if
(pstrConnectRespInfo->ies) {
-
strConnectInfo.resp_ies_len = pstrConnectRespInfo->ies_len;
-
strConnectInfo.resp_ies = kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL);
-
memcpy(strConnectInfo.resp_ies, pstrConnectRespInfo->ies,
-
pstrConnectRespInfo->ies_len);
- }
+ if (strConnectInfo.status ==
SUCCESSFUL_STATUSCODE && pstrConnectRespInfo->ies) {
+
strConnectInfo.resp_ies_len = pstrConnectRespInfo->ies_len;
+ strConnectInfo.resp_ies
= kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL);
+
memcpy(strConnectInfo.resp_ies, pstrConnectRespInfo->ies,
+
pstrConnectRespInfo->ies_len);
}
if (pstrConnectRespInfo) {
--
2.1.4
[PATCH] Staging:wilc1000:wilc_sdio: Modified comment style to preferred kernel comment style
Modified comment style to preferred kernel comment style. Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com> --- drivers/staging/wilc1000/wilc_sdio.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index cd6b8ba..ad4eb0f 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -1,11 +1,8 @@ -/* // */ -/* */ -/* Copyright (c) Atmel Corporation. All rights reserved. */ -/* */ -/* Module Name: wilc_sdio.c */ -/* */ -/* */ -/* */ +/* + * Copyright (c) Atmel Corporation. All rights reserved. + * + * Module Name: wilc_sdio.c + */ #include #include "wilc_wlan_if.h" -- 2.1.4
[PATCH] Staging:wilc1000:wilc_sdio: Modified comment style to preferred kernel comment style
Modified comment style to preferred kernel comment style. Signed-off-by: Georgios Emmanouil --- drivers/staging/wilc1000/wilc_sdio.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index cd6b8ba..ad4eb0f 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -1,11 +1,8 @@ -/* // */ -/* */ -/* Copyright (c) Atmel Corporation. All rights reserved. */ -/* */ -/* Module Name: wilc_sdio.c */ -/* */ -/* */ -/* */ +/* + * Copyright (c) Atmel Corporation. All rights reserved. + * + * Module Name: wilc_sdio.c + */ #include #include "wilc_wlan_if.h" -- 2.1.4
[PATCH] Staging:wilc1000:linux_wlan: Modified the 'if-else' statement
Modified the 'if-else' statement to make it more readable.
Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com>
---
drivers/staging/wilc1000/linux_wlan.c | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 2eebc62..d82f0ff 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -867,15 +867,10 @@ static int wilc_mac_open(struct net_device *ndev)
wilc_get_vif_idx(vif),
wl->open_ifcs);
} else {
- if (memcmp(wl->vif[i ^ 1]->bssid,
- wl->vif[i ^ 1]->src_addr, 6))
- wilc_set_wfi_drv_handler(vif,
-wilc_get_vif_idx(vif),
-0);
+ if (memcmp(wl->vif[i ^ 1]->bssid, wl->vif[i ^
1]->src_addr, 6))
+ wilc_set_wfi_drv_handler(vif,
wilc_get_vif_idx(vif), 0);
else
- wilc_set_wfi_drv_handler(vif,
-wilc_get_vif_idx(vif),
-1);
+ wilc_set_wfi_drv_handler(vif,
wilc_get_vif_idx(vif), 1);
}
wilc_set_operation_mode(vif, vif->iftype);
--
2.1.4
[PATCH] Staging:wilc1000:linux_wlan: Modified the 'if-else' statement
Modified the 'if-else' statement to make it more readable.
Signed-off-by: Georgios Emmanouil
---
drivers/staging/wilc1000/linux_wlan.c | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 2eebc62..d82f0ff 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -867,15 +867,10 @@ static int wilc_mac_open(struct net_device *ndev)
wilc_get_vif_idx(vif),
wl->open_ifcs);
} else {
- if (memcmp(wl->vif[i ^ 1]->bssid,
- wl->vif[i ^ 1]->src_addr, 6))
- wilc_set_wfi_drv_handler(vif,
-wilc_get_vif_idx(vif),
-0);
+ if (memcmp(wl->vif[i ^ 1]->bssid, wl->vif[i ^
1]->src_addr, 6))
+ wilc_set_wfi_drv_handler(vif,
wilc_get_vif_idx(vif), 0);
else
- wilc_set_wfi_drv_handler(vif,
-wilc_get_vif_idx(vif),
-1);
+ wilc_set_wfi_drv_handler(vif,
wilc_get_vif_idx(vif), 1);
}
wilc_set_operation_mode(vif, vif->iftype);
--
2.1.4
[PATCH 1/3] Staging:wilc1000:host_interface: Removed unnecessary blank line
Removed unnecessary blank line. Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com> --- drivers/staging/wilc1000/host_interface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index c307cce..090fd43 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -287,7 +287,6 @@ static int wilc_enqueue_cmd(struct host_if_msg *msg) return 0; } - /* The u8IfIdx starts from 0 to NUM_CONCURRENT_IFC -1, but 0 index used as * special purpose in wilc device, so we add 1 to the index to starts from 1. * As a result, the returned index will be 1 to NUM_CONCURRENT_IFC. -- 2.1.4
[PATCH 1/3] Staging:wilc1000:host_interface: Removed unnecessary blank line
Removed unnecessary blank line. Signed-off-by: Georgios Emmanouil --- drivers/staging/wilc1000/host_interface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index c307cce..090fd43 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -287,7 +287,6 @@ static int wilc_enqueue_cmd(struct host_if_msg *msg) return 0; } - /* The u8IfIdx starts from 0 to NUM_CONCURRENT_IFC -1, but 0 index used as * special purpose in wilc device, so we add 1 to the index to starts from 1. * As a result, the returned index will be 1 to NUM_CONCURRENT_IFC. -- 2.1.4
[PATCH 2/3] Staging:wilc1000:host_interface: Fixed alignment to match open parenthesis
Fixed alignment to match open parenthesis.
Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 090fd43..bbe1a09 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1349,7 +1349,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
if (u32RcvdAssocRespInfoLen != 0) {
s32Err =
wilc_parse_assoc_resp_info(rcv_assoc_resp, u32RcvdAssocRespInfoLen,
-
);
+
);
if (s32Err) {
netdev_err(vif->ndev,
"wilc_parse_assoc_resp_info() returned error %d\n", s32Err);
} else {
--
2.1.4
[PATCH 2/3] Staging:wilc1000:host_interface: Fixed alignment to match open parenthesis
Fixed alignment to match open parenthesis.
Signed-off-by: Georgios Emmanouil
---
drivers/staging/wilc1000/host_interface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 090fd43..bbe1a09 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1349,7 +1349,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
if (u32RcvdAssocRespInfoLen != 0) {
s32Err =
wilc_parse_assoc_resp_info(rcv_assoc_resp, u32RcvdAssocRespInfoLen,
-
);
+
);
if (s32Err) {
netdev_err(vif->ndev,
"wilc_parse_assoc_resp_info() returned error %d\n", s32Err);
} else {
--
2.1.4
[PATCH 2/2] Staging: xgifb:XGI_main_26: Added braces to the conditional statement
Coding style issue. Added brances to the conditional statement.
Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com>
---
drivers/staging/xgifb/XGI_main_26.c | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c
b/drivers/staging/xgifb/XGI_main_26.c
index c4fdc1c..1be0343 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1500,18 +1500,19 @@ static void XGIfb_detect_VB(struct xgifb_video_info
*xgifb_info)
xgifb_info->display2 = XGIFB_DISP_NONE;
}
- if (XGIfb_tvplug != -1)
+ if (XGIfb_tvplug != -1) {
/* Override with option */
xgifb_info->TV_plug = XGIfb_tvplug;
- else if (cr32 & SIS_VB_HIVISION) {
+ } else if (cr32 & SIS_VB_HIVISION) {
xgifb_info->TV_type = TVMODE_HIVISION;
xgifb_info->TV_plug = TVPLUG_SVIDEO;
- } else if (cr32 & SIS_VB_SVIDEO)
+ } else if (cr32 & SIS_VB_SVIDEO) {
xgifb_info->TV_plug = TVPLUG_SVIDEO;
- else if (cr32 & SIS_VB_COMPOSITE)
+ } else if (cr32 & SIS_VB_COMPOSITE) {
xgifb_info->TV_plug = TVPLUG_COMPOSITE;
- else if (cr32 & SIS_VB_SCART)
+ } else if (cr32 & SIS_VB_SCART) {
xgifb_info->TV_plug = TVPLUG_SCART;
+ }
if (xgifb_info->TV_type == 0) {
temp = xgifb_reg_get(XGICR, 0x38);
--
2.1.4
[PATCH 2/2] Staging: xgifb:XGI_main_26: Added braces to the conditional statement
Coding style issue. Added brances to the conditional statement.
Signed-off-by: Georgios Emmanouil
---
drivers/staging/xgifb/XGI_main_26.c | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c
b/drivers/staging/xgifb/XGI_main_26.c
index c4fdc1c..1be0343 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1500,18 +1500,19 @@ static void XGIfb_detect_VB(struct xgifb_video_info
*xgifb_info)
xgifb_info->display2 = XGIFB_DISP_NONE;
}
- if (XGIfb_tvplug != -1)
+ if (XGIfb_tvplug != -1) {
/* Override with option */
xgifb_info->TV_plug = XGIfb_tvplug;
- else if (cr32 & SIS_VB_HIVISION) {
+ } else if (cr32 & SIS_VB_HIVISION) {
xgifb_info->TV_type = TVMODE_HIVISION;
xgifb_info->TV_plug = TVPLUG_SVIDEO;
- } else if (cr32 & SIS_VB_SVIDEO)
+ } else if (cr32 & SIS_VB_SVIDEO) {
xgifb_info->TV_plug = TVPLUG_SVIDEO;
- else if (cr32 & SIS_VB_COMPOSITE)
+ } else if (cr32 & SIS_VB_COMPOSITE) {
xgifb_info->TV_plug = TVPLUG_COMPOSITE;
- else if (cr32 & SIS_VB_SCART)
+ } else if (cr32 & SIS_VB_SCART) {
xgifb_info->TV_plug = TVPLUG_SCART;
+ }
if (xgifb_info->TV_type == 0) {
temp = xgifb_reg_get(XGICR, 0x38);
--
2.1.4
[PATCH 1/2] Staging: xgifb:XGI_main_26: Added braces to the 'if' statement
Coding style issue. Added brances to the 'if' statement.
Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com>
---
drivers/staging/xgifb/XGI_main_26.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c
b/drivers/staging/xgifb/XGI_main_26.c
index 6930f7e..c4fdc1c 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1480,9 +1480,9 @@ static void XGIfb_detect_VB(struct xgifb_video_info
*xgifb_info)
cr32 = xgifb_reg_get(XGICR, IND_XGI_SCRATCH_REG_CR32);
- if ((cr32 & SIS_CRT1) && !XGIfb_crt1off)
+ if ((cr32 & SIS_CRT1) && !XGIfb_crt1off) {
XGIfb_crt1off = 0;
- else {
+ } else {
if (cr32 & 0x5F)
XGIfb_crt1off = 1;
else
--
2.1.4
[PATCH 1/2] Staging: xgifb:XGI_main_26: Added braces to the 'if' statement
Coding style issue. Added brances to the 'if' statement.
Signed-off-by: Georgios Emmanouil
---
drivers/staging/xgifb/XGI_main_26.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c
b/drivers/staging/xgifb/XGI_main_26.c
index 6930f7e..c4fdc1c 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1480,9 +1480,9 @@ static void XGIfb_detect_VB(struct xgifb_video_info
*xgifb_info)
cr32 = xgifb_reg_get(XGICR, IND_XGI_SCRATCH_REG_CR32);
- if ((cr32 & SIS_CRT1) && !XGIfb_crt1off)
+ if ((cr32 & SIS_CRT1) && !XGIfb_crt1off) {
XGIfb_crt1off = 0;
- else {
+ } else {
if (cr32 & 0x5F)
XGIfb_crt1off = 1;
else
--
2.1.4
[PATCH] Staging: xgifb:XGI_main_26: Fixed coding style issues
Fixed coding style issues. Patch applies to linux-next-20170217 tree.
Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com>
---
drivers/staging/xgifb/XGI_main_26.c | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c
b/drivers/staging/xgifb/XGI_main_26.c
index 6930f7e..1be0343 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1480,9 +1480,9 @@ static void XGIfb_detect_VB(struct xgifb_video_info
*xgifb_info)
cr32 = xgifb_reg_get(XGICR, IND_XGI_SCRATCH_REG_CR32);
- if ((cr32 & SIS_CRT1) && !XGIfb_crt1off)
+ if ((cr32 & SIS_CRT1) && !XGIfb_crt1off) {
XGIfb_crt1off = 0;
- else {
+ } else {
if (cr32 & 0x5F)
XGIfb_crt1off = 1;
else
@@ -1500,18 +1500,19 @@ static void XGIfb_detect_VB(struct xgifb_video_info
*xgifb_info)
xgifb_info->display2 = XGIFB_DISP_NONE;
}
- if (XGIfb_tvplug != -1)
+ if (XGIfb_tvplug != -1) {
/* Override with option */
xgifb_info->TV_plug = XGIfb_tvplug;
- else if (cr32 & SIS_VB_HIVISION) {
+ } else if (cr32 & SIS_VB_HIVISION) {
xgifb_info->TV_type = TVMODE_HIVISION;
xgifb_info->TV_plug = TVPLUG_SVIDEO;
- } else if (cr32 & SIS_VB_SVIDEO)
+ } else if (cr32 & SIS_VB_SVIDEO) {
xgifb_info->TV_plug = TVPLUG_SVIDEO;
- else if (cr32 & SIS_VB_COMPOSITE)
+ } else if (cr32 & SIS_VB_COMPOSITE) {
xgifb_info->TV_plug = TVPLUG_COMPOSITE;
- else if (cr32 & SIS_VB_SCART)
+ } else if (cr32 & SIS_VB_SCART) {
xgifb_info->TV_plug = TVPLUG_SCART;
+ }
if (xgifb_info->TV_type == 0) {
temp = xgifb_reg_get(XGICR, 0x38);
--
2.1.4
[PATCH] Staging: xgifb:XGI_main_26: Fixed coding style issues
Fixed coding style issues. Patch applies to linux-next-20170217 tree.
Signed-off-by: Georgios Emmanouil
---
drivers/staging/xgifb/XGI_main_26.c | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c
b/drivers/staging/xgifb/XGI_main_26.c
index 6930f7e..1be0343 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1480,9 +1480,9 @@ static void XGIfb_detect_VB(struct xgifb_video_info
*xgifb_info)
cr32 = xgifb_reg_get(XGICR, IND_XGI_SCRATCH_REG_CR32);
- if ((cr32 & SIS_CRT1) && !XGIfb_crt1off)
+ if ((cr32 & SIS_CRT1) && !XGIfb_crt1off) {
XGIfb_crt1off = 0;
- else {
+ } else {
if (cr32 & 0x5F)
XGIfb_crt1off = 1;
else
@@ -1500,18 +1500,19 @@ static void XGIfb_detect_VB(struct xgifb_video_info
*xgifb_info)
xgifb_info->display2 = XGIFB_DISP_NONE;
}
- if (XGIfb_tvplug != -1)
+ if (XGIfb_tvplug != -1) {
/* Override with option */
xgifb_info->TV_plug = XGIfb_tvplug;
- else if (cr32 & SIS_VB_HIVISION) {
+ } else if (cr32 & SIS_VB_HIVISION) {
xgifb_info->TV_type = TVMODE_HIVISION;
xgifb_info->TV_plug = TVPLUG_SVIDEO;
- } else if (cr32 & SIS_VB_SVIDEO)
+ } else if (cr32 & SIS_VB_SVIDEO) {
xgifb_info->TV_plug = TVPLUG_SVIDEO;
- else if (cr32 & SIS_VB_COMPOSITE)
+ } else if (cr32 & SIS_VB_COMPOSITE) {
xgifb_info->TV_plug = TVPLUG_COMPOSITE;
- else if (cr32 & SIS_VB_SCART)
+ } else if (cr32 & SIS_VB_SCART) {
xgifb_info->TV_plug = TVPLUG_SCART;
+ }
if (xgifb_info->TV_type == 0) {
temp = xgifb_reg_get(XGICR, 0x38);
--
2.1.4
[PATCH] Staging: wlan-ng: prism2mgmt: Removed an empty line
Removed an empty line.
Signed-off-by: Georgios Emmanouil <geo.em...@gmail.com>
---
drivers/staging/wlan-ng/prism2mgmt.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c
b/drivers/staging/wlan-ng/prism2mgmt.c
index 0e671c3..e23a0d0 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -1168,7 +1168,6 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void
*msgp)
}
} else {
result = hfa384x_drvr_disable(hw, 0);
-
}
netdev_info(wlandev->netdev, "monitor mode disabled\n");
--
2.1.4
[PATCH] Staging: wlan-ng: prism2mgmt: Removed an empty line
Removed an empty line.
Signed-off-by: Georgios Emmanouil
---
drivers/staging/wlan-ng/prism2mgmt.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c
b/drivers/staging/wlan-ng/prism2mgmt.c
index 0e671c3..e23a0d0 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -1168,7 +1168,6 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void
*msgp)
}
} else {
result = hfa384x_drvr_disable(hw, 0);
-
}
netdev_info(wlandev->netdev, "monitor mode disabled\n");
--
2.1.4
