aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Schölling <manuel.schoelling@gmx.de>2014-06-22 07:24:54 -0400
committerDavid S. Miller <davem@davemloft.net>2014-06-22 20:14:56 -0400
commit9f8b93cb32e088d3377c86fabb666b884bac0f12 (patch)
tree11187e8abd048d1cfceec2f832ff0a30df7e4fd8
parent2b74e2caece67798195228775306aa97dbc51516 (diff)
xilinx: Fix compiler warning
The time comparsion functions require arguments of type unsigned long instead of (signed) long. Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/xilinx/ll_temac_main.c2
-rw-r--r--drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c2
-rw-r--r--drivers/net/ethernet/xilinx/xilinx_emaclite.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 4ef818a7a6c6..8a6e5c2d6f95 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -72,7 +72,7 @@ void temac_iow(struct temac_local *lp, int offset, u32 value)
72 72
73int temac_indirect_busywait(struct temac_local *lp) 73int temac_indirect_busywait(struct temac_local *lp)
74{ 74{
75 long end = jiffies + 2; 75 unsigned long end = jiffies + 2;
76 76
77 while (!(temac_ior(lp, XTE_RDY0_OFFSET) & XTE_RDY0_HARD_ACS_RDY_MASK)) { 77 while (!(temac_ior(lp, XTE_RDY0_OFFSET) & XTE_RDY0_HARD_ACS_RDY_MASK)) {
78 if (time_before_eq(end, jiffies)) { 78 if (time_before_eq(end, jiffies)) {
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index d4abf478e2bb..3b67d60d4378 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -19,7 +19,7 @@
19/* Wait till MDIO interface is ready to accept a new transaction.*/ 19/* Wait till MDIO interface is ready to accept a new transaction.*/
20int axienet_mdio_wait_until_ready(struct axienet_local *lp) 20int axienet_mdio_wait_until_ready(struct axienet_local *lp)
21{ 21{
22 long end = jiffies + 2; 22 unsigned long end = jiffies + 2;
23 while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) & 23 while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) &
24 XAE_MDIO_MCR_READY_MASK)) { 24 XAE_MDIO_MCR_READY_MASK)) {
25 if (time_before_eq(end, jiffies)) { 25 if (time_before_eq(end, jiffies)) {
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 8c4aed3053eb..782bb9373cd8 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -695,7 +695,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)
695 695
696static int xemaclite_mdio_wait(struct net_local *lp) 696static int xemaclite_mdio_wait(struct net_local *lp)
697{ 697{
698 long end = jiffies + 2; 698 unsigned long end = jiffies + 2;
699 699
700 /* wait for the MDIO interface to not be busy or timeout 700 /* wait for the MDIO interface to not be busy or timeout
701 after some time. 701 after some time.