From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH] SMC911x: unbreak PXA builds Date: Tue, 21 Oct 2008 01:15:39 -0400 Message-ID: <48FD657B.7060307@pobox.com> References: <1224549389-13840-1-git-send-email-dbaryshkov@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, Eric Miao To: Dmitry Baryshkov Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:53369 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751694AbYJUFPn (ORCPT ); Tue, 21 Oct 2008 01:15:43 -0400 In-Reply-To: <1224549389-13840-1-git-send-email-dbaryshkov@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Dmitry Baryshkov wrote: > Currently SMC911x driver is broken on ARM/PXA builds. > Unbreak such configurations. > > Signed-off-by: Dmitry Baryshkov > --- > drivers/net/smc911x.c | 2 +- > drivers/net/smc911x.h | 6 ++++-- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c > index ddcefde..402fd06 100644 > --- a/drivers/net/smc911x.c > +++ b/drivers/net/smc911x.c > @@ -1241,7 +1241,7 @@ smc911x_rx_dma_irq(int dma, void *data) > netif_rx(skb); > > spin_lock_irqsave(&lp->lock, flags); > - pkts = (SMC_GET_RX_FIFO_INF() & RX_FIFO_INF_RXSUSED_) >> 16; > + pkts = (SMC_GET_RX_FIFO_INF(lp) & RX_FIFO_INF_RXSUSED_) >> 16; > if (pkts != 0) { > smc911x_rcv(dev); > }else { > diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h > index bf6240f..cc7d85b 100644 > --- a/drivers/net/smc911x.h > +++ b/drivers/net/smc911x.h > @@ -50,6 +50,10 @@ > #define SMC_DYNAMIC_BUS_CONFIG > #endif > > +#ifdef SMC_USE_PXA_DMA > +#define SMC_USE_DMA > +#endif > + > /* store this information for the driver.. */ > struct smc911x_local { > /* > @@ -196,8 +200,6 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg, > > > #ifdef SMC_USE_PXA_DMA > -#define SMC_USE_DMA applied