aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2007-09-19 12:55:12 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:52:21 -0400
commit6b9bafec6608539d07f7ccdeefe121dabe06604f (patch)
tree38a76e37746631b5ad7925864899a03b7b2836eb
parent4b402c65a3a17257af45875159395278e4a2f0cd (diff)
[SSB]: Sparse fixes.
This fixes all Sparse warnings in SSB. No semantics change. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/ssb/b43_pci_bridge.c2
-rw-r--r--drivers/ssb/driver_chipcommon.c7
-rw-r--r--drivers/ssb/pci.c10
3 files changed, 10 insertions, 9 deletions
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c
index fa3bd292f5f7..f145d8a4cfde 100644
--- a/drivers/ssb/b43_pci_bridge.c
+++ b/drivers/ssb/b43_pci_bridge.c
@@ -13,6 +13,8 @@
13#include <linux/pci.h> 13#include <linux/pci.h>
14#include <linux/ssb/ssb.h> 14#include <linux/ssb/ssb.h>
15 15
16#include "ssb_private.h"
17
16 18
17static const struct pci_device_id b43_pci_bridge_tbl[] = { 19static const struct pci_device_id b43_pci_bridge_tbl[] = {
18 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4301) }, 20 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4301) },
diff --git a/drivers/ssb/driver_chipcommon.c b/drivers/ssb/driver_chipcommon.c
index a890544e8fba..6fbf1c53b6f2 100644
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
@@ -345,8 +345,7 @@ void ssb_chipco_timing_init(struct ssb_chipcommon *cc,
345} 345}
346 346
347/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */ 347/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
348void 348void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks)
349ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks)
350{ 349{
351 /* instant NMI */ 350 /* instant NMI */
352 chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks); 351 chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
@@ -359,12 +358,12 @@ u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask)
359 358
360void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value) 359void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)
361{ 360{
362 return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value); 361 chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);
363} 362}
364 363
365void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value) 364void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)
366{ 365{
367 return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value); 366 chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);
368} 367}
369 368
370#ifdef CONFIG_SSB_SERIAL 369#ifdef CONFIG_SSB_SERIAL
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index e19b9f90195e..0ab095c6581a 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -306,15 +306,15 @@ static void sprom_extract_r1(struct ssb_sprom_r1 *out, const u16 *in)
306 SPEX(pci_pid, SSB_SPROM1_PID, 0xFFFF, 0); 306 SPEX(pci_pid, SSB_SPROM1_PID, 0xFFFF, 0);
307 for (i = 0; i < 3; i++) { 307 for (i = 0; i < 3; i++) {
308 v = in[SPOFF(SSB_SPROM1_IL0MAC) + i]; 308 v = in[SPOFF(SSB_SPROM1_IL0MAC) + i];
309 *(((u16 *)out->il0mac) + i) = cpu_to_be16(v); 309 *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
310 } 310 }
311 for (i = 0; i < 3; i++) { 311 for (i = 0; i < 3; i++) {
312 v = in[SPOFF(SSB_SPROM1_ET0MAC) + i]; 312 v = in[SPOFF(SSB_SPROM1_ET0MAC) + i];
313 *(((u16 *)out->et0mac) + i) = cpu_to_be16(v); 313 *(((__be16 *)out->et0mac) + i) = cpu_to_be16(v);
314 } 314 }
315 for (i = 0; i < 3; i++) { 315 for (i = 0; i < 3; i++) {
316 v = in[SPOFF(SSB_SPROM1_ET1MAC) + i]; 316 v = in[SPOFF(SSB_SPROM1_ET1MAC) + i];
317 *(((u16 *)out->et1mac) + i) = cpu_to_be16(v); 317 *(((__be16 *)out->et1mac) + i) = cpu_to_be16(v);
318 } 318 }
319 SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0); 319 SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0);
320 SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A, 320 SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A,
@@ -352,7 +352,7 @@ static void sprom_extract_r1(struct ssb_sprom_r1 *out, const u16 *in)
352 SSB_SPROM1_AGAIN_BG_SHIFT); 352 SSB_SPROM1_AGAIN_BG_SHIFT);
353 for (i = 0; i < 4; i++) { 353 for (i = 0; i < 4; i++) {
354 v = in[SPOFF(SSB_SPROM1_OEM) + i]; 354 v = in[SPOFF(SSB_SPROM1_OEM) + i];
355 *(((u16 *)out->oem) + i) = cpu_to_le16(v); 355 *(((__le16 *)out->oem) + i) = cpu_to_le16(v);
356 } 356 }
357} 357}
358 358
@@ -374,7 +374,7 @@ static void sprom_extract_r2(struct ssb_sprom_r2 *out, const u16 *in)
374 SPEX(ofdm_pwr_off, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0); 374 SPEX(ofdm_pwr_off, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0);
375 for (i = 0; i < 4; i++) { 375 for (i = 0; i < 4; i++) {
376 v = in[SPOFF(SSB_SPROM2_CCODE) + i]; 376 v = in[SPOFF(SSB_SPROM2_CCODE) + i];
377 *(((u16 *)out->country_str) + i) = cpu_to_le16(v); 377 *(((__le16 *)out->country_str) + i) = cpu_to_le16(v);
378 } 378 }
379} 379}
380 380