| Message ID | BANLkTi=gcFB4mbmWKu4neep77Jp8R4HWGQ@mail.gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Adam, 2011/4/27 Adam Jaremko <adam.jaremko@gmail.com>: > Signed-off-by: Adam Jaremko <adam.jaremko@gmail.com> > --- > drivers/net/ftmac100.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c > index a316619..9bd7746 100644 > --- a/drivers/net/ftmac100.c > +++ b/drivers/net/ftmac100.c > @@ -139,11 +139,11 @@ static int ftmac100_reset(struct ftmac100 *priv) > * that hardware reset completed (what the f*ck). > * We still need to wait for a while. > */ > - usleep_range(500, 1000); > + udelay(500); > return 0; > } > > - usleep_range(1000, 10000); > + udelay(1000); > } > > netdev_err(netdev, "software reset failed\n"); > @@ -772,7 +772,7 @@ static int ftmac100_mdio_read(struct net_device > *netdev, int phy_id, int reg) > if ((phycr & FTMAC100_PHYCR_MIIRD) == 0) > return phycr & FTMAC100_PHYCR_MIIRDATA; > > - usleep_range(100, 1000); > + udelay(100); > } > > netdev_err(netdev, "mdio read timed out\n"); > @@ -801,7 +801,7 @@ static void ftmac100_mdio_write(struct net_device > *netdev, int phy_id, int reg, > if ((phycr & FTMAC100_PHYCR_MIIWR) == 0) > return; > > - usleep_range(100, 1000); > + udelay(100); > } > > netdev_err(netdev, "mdio write timed out\n"); > -- > 1.7.4.4 > Not sure if your patch is indeed corrupt or it's my fault while downloading patch from gmail: ERROR: patch seems to be corrupt (line wrapped?) #62: FILE: drivers/net/ftmac100.c:771: *netdev, int phy_id, int reg) total: 1 errors, 0 warnings, 31 lines checked ftmac100-fix.patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. Except that, Acked-by: Po-Yu Chuang <ratbert@faraday-tech.com> best regards, Po-Yu Chuang -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Adam Jaremko <adam.jaremko@gmail.com> Date: Tue, 26 Apr 2011 12:32:56 -0400 > @@ -801,7 +801,7 @@ static void ftmac100_mdio_write(struct net_device > *netdev, int phy_id, int reg, Your email client corrupted the patch, adding line breaks etc. Please fix this problem, send a test email to yourself, try to apply the patch you receive in that test email, and then when that is working (and only then) resubmit this patch here so I can apply it. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index a316619..9bd7746 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -139,11 +139,11 @@ static int ftmac100_reset(struct ftmac100 *priv) * that hardware reset completed (what the f*ck). * We still need to wait for a while. */ - usleep_range(500, 1000); + udelay(500); return 0; } - usleep_range(1000, 10000); + udelay(1000); } netdev_err(netdev, "software reset failed\n"); @@ -772,7 +772,7 @@ static int ftmac100_mdio_read(struct net_device *netdev, int phy_id, int reg) if ((phycr & FTMAC100_PHYCR_MIIRD) == 0) return phycr & FTMAC100_PHYCR_MIIRDATA; - usleep_range(100, 1000); + udelay(100); }
Signed-off-by: Adam Jaremko <adam.jaremko@gmail.com> --- drivers/net/ftmac100.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) netdev_err(netdev, "mdio read timed out\n"); @@ -801,7 +801,7 @@ static void ftmac100_mdio_write(struct net_device *netdev, int phy_id, int reg, if ((phycr & FTMAC100_PHYCR_MIIWR) == 0) return; - usleep_range(100, 1000); + udelay(100); } netdev_err(netdev, "mdio write timed out\n");