2011-08-23 21:57:01

by Randy Dunlap

Subject: [PATCH] staging: brcmsmac, fix build for SMP disabled

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_SMP is not enabled.
Fixes many build errors (subset listed here):

drivers/staging/brcm80211/brcmsmac/ampdu.c: In function 'brcms_c_ampdu_dotxstatus':
drivers/staging/brcm80211/brcmsmac/ampdu.c:833: error: implicit declaration of function 'readb'
drivers/staging/brcm80211/brcmsmac/ampdu.c:833: error: implicit declaration of function 'readw'
drivers/staging/brcm80211/brcmsmac/ampdu.c:833: error: implicit declaration of function 'readl'
drivers/staging/brcm80211/brcmsmac/main.c: In function 'brcms_c_init':
drivers/staging/brcm80211/brcmsmac/main.c:494: error: implicit declaration of function 'writeb'
drivers/staging/brcm80211/brcmsmac/main.c:494: error: implicit declaration of function 'writew'
drivers/staging/brcm80211/brcmsmac/main.c:494: error: implicit declaration of function 'writel'
drivers/staging/brcm80211/brcmsmac/main.c:529: error: implicit declaration of function 'readb'
drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c: In function 'wlc_radioreg_exit':
drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c:208: error: implicit declaration of function 'readb'
drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c:208: error: implicit declaration of function 'readw'
drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c: In function 'wlc_lcnphy_idle_tssi_est':
drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c:2080: error: implicit declaration of function 'readb'
drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c: In function 'wlc_lcnphy_samp_cap':
drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c:3837: error: implicit declaration of function 'writeb'
vers/staging/brcm80211/brcmsmac/phy/phy_n.c: In function 'wlc_phy_init_nphy':
drivers/staging/brcm80211/brcmsmac/phy/phy_n.c:14561: error: implicit declaration of function 'readb'

Signed-off-by: Randy Dunlap <[email protected]>
---
drivers/staging/brcm80211/brcmsmac/types.h | 1 +
1 file changed, 1 insertion(+)

--- lnx-31-rc3.orig/drivers/staging/brcm80211/brcmsmac/types.h
+++ lnx-31-rc3/drivers/staging/brcm80211/brcmsmac/types.h
@@ -18,6 +18,7 @@
#define _BRCM_TYPES_H_

#include <linux/types.h>
+#include <asm/io.h>

/* Bus types */
#define SI_BUS 0 /* SOC Interconnect */

2011-08-23 22:29:21

by Henry Ptasinski

Subject: Re: [PATCH] staging: brcmsmac, fix build for SMP disabled

On Tue, Aug 23, 2011 at 02:56:59PM -0700, Randy Dunlap wrote:
> ---
> drivers/staging/brcm80211/brcmsmac/types.h | 1 +
> 1 file changed, 1 insertion(+)
>
> --- lnx-31-rc3.orig/drivers/staging/brcm80211/brcmsmac/types.h
> +++ lnx-31-rc3/drivers/staging/brcm80211/brcmsmac/types.h
> @@ -18,6 +18,7 @@
> #define _BRCM_TYPES_H_
>
> #include <linux/types.h>
> +#include <asm/io.h>
>
> /* Bus types */
> #define SI_BUS 0 /* SOC Interconnect */
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html


I believe this is covered by a patch that Greg merged earlier today (which adds
'#include <linux/io.h>' to types.h).

- Henry

2011-08-23 22:28:13

by Greg KH

Subject: Re: [PATCH] staging: brcmsmac, fix build for SMP disabled

On Tue, Aug 23, 2011 at 02:56:59PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> Fix build when CONFIG_SMP is not enabled.
> Fixes many build errors (subset listed here):
>
> drivers/staging/brcm80211/brcmsmac/ampdu.c: In function 'brcms_c_ampdu_dotxstatus':
> drivers/staging/brcm80211/brcmsmac/ampdu.c:833: error: implicit declaration of function 'readb'
> drivers/staging/brcm80211/brcmsmac/ampdu.c:833: error: implicit declaration of function 'readw'
> drivers/staging/brcm80211/brcmsmac/ampdu.c:833: error: implicit declaration of function 'readl'
> drivers/staging/brcm80211/brcmsmac/main.c: In function 'brcms_c_init':
> drivers/staging/brcm80211/brcmsmac/main.c:494: error: implicit declaration of function 'writeb'
> drivers/staging/brcm80211/brcmsmac/main.c:494: error: implicit declaration of function 'writew'
> drivers/staging/brcm80211/brcmsmac/main.c:494: error: implicit declaration of function 'writel'
> drivers/staging/brcm80211/brcmsmac/main.c:529: error: implicit declaration of function 'readb'
> drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c: In function 'wlc_radioreg_exit':
> drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c:208: error: implicit declaration of function 'readb'
> drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c:208: error: implicit declaration of function 'readw'
> drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c: In function 'wlc_lcnphy_idle_tssi_est':
> drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c:2080: error: implicit declaration of function 'readb'
> drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c: In function 'wlc_lcnphy_samp_cap':
> drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c:3837: error: implicit declaration of function 'writeb'
> vers/staging/brcm80211/brcmsmac/phy/phy_n.c: In function 'wlc_phy_init_nphy':
> drivers/staging/brcm80211/brcmsmac/phy/phy_n.c:14561: error: implicit declaration of function 'readb'
>
> Signed-off-by: Randy Dunlap <[email protected]>

No longer applies as I took a different patch that resolves this a few
hours ago :(

greg k-h