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

Commit 1159024d authored by John W. Linville's avatar John W. Linville
Browse files

ssb: fix pcicore build breakage 



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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6b86bd62

drivers/ssb/main.c

+10 −4
Original line number Diff line number Diff line
@@ -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. */