* [PATCH] SMC911x: unbreak PXA builds
@ 2008-10-21 0:36 Dmitry Baryshkov
2008-10-21 5:15 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Baryshkov @ 2008-10-21 0:36 UTC (permalink / raw)
To: netdev; +Cc: jgarzik, Eric Miao, Dmitry Baryshkov
Currently SMC911x driver is broken on ARM/PXA builds.
Unbreak such configurations.
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
---
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
-
/*
* Define the request and free functions
* These are unfortunately architecture specific as no generic allocation
--
1.5.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] SMC911x: unbreak PXA builds
2008-10-21 0:36 [PATCH] SMC911x: unbreak PXA builds Dmitry Baryshkov
@ 2008-10-21 5:15 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-10-21 5:15 UTC (permalink / raw)
To: Dmitry Baryshkov; +Cc: netdev, Eric Miao
Dmitry Baryshkov wrote:
> Currently SMC911x driver is broken on ARM/PXA builds.
> Unbreak such configurations.
>
> Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-10-21 5:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-21 0:36 [PATCH] SMC911x: unbreak PXA builds Dmitry Baryshkov
2008-10-21 5:15 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).