From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from rcsinet10.oracle.com ([148.87.113.121]:28125 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759588Ab1EMQrd (ORCPT ); Fri, 13 May 2011 12:47:33 -0400 Date: Fri, 13 May 2011 09:46:57 -0700 From: Randy Dunlap To: "John W. Linville" Cc: linux-wireless@vger.kernel.org, Randy Dunlap Subject: Re: [PATCH v2] ssb: fix pcicore build breakage Message-Id: <20110513094657.5d38e959.randy.dunlap@oracle.com> (sfid-20110513_184737_228307_51EE2A6A) In-Reply-To: <1305296570-23671-1-git-send-email-linville@tuxdriver.com> References: <1305294214.12573.3.camel@maggie> <1305296570-23671-1-git-send-email-linville@tuxdriver.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-wireless-owner@vger.kernel.org List-ID: 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 > Signed-off-by: John W. Linville > --- > 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 ***