Search Linux Wireless

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

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

 



2011/5/13 John W. Linville <linville@xxxxxxxxxxxxx>:
> 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>
> ---
> Â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. */
> --
> 1.7.4.4

Acked-by: RafaÅ MiÅecki <zajec5@xxxxxxxxx>

-- 
RafaÅ
--
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