Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b9bafec authored by Michael Buesch's avatar Michael Buesch Committed by David S. Miller
Browse files

[SSB]: Sparse fixes. 



This fixes all Sparse warnings in SSB.
No semantics change.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b402c65

drivers/ssb/b43_pci_bridge.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/ssb/ssb.h>

#include <linux/ssb/ssb.h>





#include "ssb_private.h"







static const struct pci_device_id b43_pci_bridge_tbl[] = {

static const struct pci_device_id b43_pci_bridge_tbl[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4301) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4301) },

drivers/ssb/driver_chipcommon.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -345,8 +345,7 @@ void ssb_chipco_timing_init(struct ssb_chipcommon *cc, 
}

}





/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */

/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */

void

void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks)

ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks)

{

{

	/* instant NMI */

	/* instant NMI */

	chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);

	chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
@@ -359,12 +358,12 @@ u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask) 




void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)

void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)

{

{

	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);

	chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);

}

}





void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)

void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)

{

{

	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);

	chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);

}

}





#ifdef CONFIG_SSB_SERIAL

#ifdef CONFIG_SSB_SERIAL

drivers/ssb/pci.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -306,15 +306,15 @@ static void sprom_extract_r1(struct ssb_sprom_r1 *out, const u16 *in) 
	SPEX(pci_pid, SSB_SPROM1_PID, 0xFFFF, 0);

	SPEX(pci_pid, SSB_SPROM1_PID, 0xFFFF, 0);

	for (i = 0; i < 3; i++) {

	for (i = 0; i < 3; i++) {

		v = in[SPOFF(SSB_SPROM1_IL0MAC) + i];

		v = in[SPOFF(SSB_SPROM1_IL0MAC) + i];

		*(((u16 *)out->il0mac) + i) = cpu_to_be16(v);

		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);

	}

	}

	for (i = 0; i < 3; i++) {

	for (i = 0; i < 3; i++) {

		v = in[SPOFF(SSB_SPROM1_ET0MAC) + i];

		v = in[SPOFF(SSB_SPROM1_ET0MAC) + i];

		*(((u16 *)out->et0mac) + i) = cpu_to_be16(v);

		*(((__be16 *)out->et0mac) + i) = cpu_to_be16(v);

	}

	}

	for (i = 0; i < 3; i++) {

	for (i = 0; i < 3; i++) {

		v = in[SPOFF(SSB_SPROM1_ET1MAC) + i];

		v = in[SPOFF(SSB_SPROM1_ET1MAC) + i];

		*(((u16 *)out->et1mac) + i) = cpu_to_be16(v);

		*(((__be16 *)out->et1mac) + i) = cpu_to_be16(v);

	}

	}

	SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0);

	SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0);

	SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A,

	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) 
	     SSB_SPROM1_AGAIN_BG_SHIFT);

	     SSB_SPROM1_AGAIN_BG_SHIFT);

	for (i = 0; i < 4; i++) {

	for (i = 0; i < 4; i++) {

		v = in[SPOFF(SSB_SPROM1_OEM) + i];

		v = in[SPOFF(SSB_SPROM1_OEM) + i];

		*(((u16 *)out->oem) + i) = cpu_to_le16(v);

		*(((__le16 *)out->oem) + i) = cpu_to_le16(v);

	}

	}

}

}
@@ -374,7 +374,7 @@ static void sprom_extract_r2(struct ssb_sprom_r2 *out, const u16 *in) 
	SPEX(ofdm_pwr_off, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0);

	SPEX(ofdm_pwr_off, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0);

	for (i = 0; i < 4; i++) {

	for (i = 0; i < 4; i++) {

		v = in[SPOFF(SSB_SPROM2_CCODE) + i];

		v = in[SPOFF(SSB_SPROM2_CCODE) + i];

		*(((u16 *)out->country_str) + i) = cpu_to_le16(v);

		*(((__le16 *)out->country_str) + i) = cpu_to_le16(v);

	}

	}

}

}