Search Linux Wireless

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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 05/13/11 12:07, 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'
> 
> Reported-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

Thanks.

> ---
>  drivers/ssb/main.c |   14 ++++++++++----
>  1 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
> index ee2937c..f8a13f8 100644
> --- a/drivers/ssb/main.c
> +++ b/drivers/ssb/main.c
> @@ -1332,21 +1332,27 @@ 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)
>  {
>  	struct ssb_device *dev;
>  
> +#ifdef CONFIG_SSB_DRIVER_PCICORE
>  	dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
> +#else
> +	dev = bus->chipco.dev;
> +#endif
>  	if (WARN_ON(!dev))
>  		return;
>  	/* This forces an update of the cached registers. */


-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]
  Powered by Linux