Re: [PATCH v2] ssb: fix pcicore build breakage

[Randy Dunlap <randy.dunlap@oracle.com>]

On Fri, 13 May 2011 10:22:50 -0400 John W. Linville wrote:

> drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
> drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
> drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'

This patch does not fix the last error above when CONFIG_PCI is not enabled.


> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
> Use CHIPCO definitions since they should always(?) be valid...
> 
>  drivers/ssb/main.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
> index ee2937c..b2abd0f 100644
> --- a/drivers/ssb/main.c
> +++ b/drivers/ssb/main.c
> @@ -1332,14 +1332,16 @@ EXPORT_SYMBOL(ssb_bus_powerup);
>  static void ssb_broadcast_value(struct ssb_device *dev,
>  				u32 address, u32 data)
>  {
> +#ifdef CONFIG_SSB_DRIVER_PCICORE
>  	/* This is used for both, PCI and ChipCommon core, so be careful. */
>  	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
>  	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
> +#endif
>  
> -	ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
> -	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
> -	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
> -	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
> +	ssb_write32(dev, SSB_CHIPCO_BCAST_ADDR, address);
> +	ssb_read32(dev, SSB_CHIPCO_BCAST_ADDR); /* flush */
> +	ssb_write32(dev, SSB_CHIPCO_BCAST_DATA, data);
> +	ssb_read32(dev, SSB_CHIPCO_BCAST_DATA); /* flush */
>  }
>  
>  void ssb_commit_settings(struct ssb_bus *bus)
> -- 


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***