Re: Re: [PATCH] USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support
Dear David : Thanks a lot. please check the patch. thanks again. 2013-08-29 liujunliang_ljl 发件人： David Miller 发送时间： 2013-08-29 05:44:06 收件人： liujunliang_ljl 抄送： horms; joe; romieu; gregkh; netdev; linux-usb; linux-kernel; sunhecheng 主题： Re: [PATCH] USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support From: liujunliang_...@163.com Date: Sat, 24 Aug 2013 19:26:00 +0800 > From: liujl Your proper name is not "liujl", please put something more reasonable here and also in your Signoff. Also, integrate Joe Perches's white space fixes into this patch as part of your resubmission. Thank you.
Re: Re: [PATCH] USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support
Dear David : Thanks a lot. please check the patch. thanks again. 2013-08-29 liujunliang_ljl 发件人： David Miller 发送时间： 2013-08-29 05:44:06 收件人： liujunliang_ljl 抄送： horms; joe; romieu; gregkh; netdev; linux-usb; linux-kernel; sunhecheng 主题： Re: [PATCH] USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support From: liujunliang_...@163.com Date: Sat, 24 Aug 2013 19:26:00 +0800 From: liujl liujunliang_...@163.com Your proper name is not liujl, please put something more reasonable here and also in your Signoff. Also, integrate Joe Perches's white space fixes into this patch as part of your resubmission. Thank you.
Re: Re: [PATCH] USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support
DearJoe :
I'm sorry to ask you that, do you need me to merge the
patch and re-send it again.
And which version of kernel will release this driver.
Thanks a lot and apologizing for making you trouble.
Thanks again.
2013-08-26
liujunliang_ljl
发件人： Joe Perches
发送时间： 2013-08-25 02:15:19
收件人： liujunliang_ljl
抄送： davem; horms; romieu; gregkh; netdev; linux-usb; linux-kernel; sunhecheng
主题： Re: [PATCH] USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver
Support
Some whitespace and neatening fixups.
Some conversions from 4 indent tabs to normal tabs
Signed-off-by: Joe Perches
---
Just doing this instead of commenting about spacing
again.
drivers/net/usb/sr9700.c | 127 +--
1 file changed, 67 insertions(+), 60 deletions(-)
diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c
index 27c86ec..4262b9d 100644
--- a/drivers/net/usb/sr9700.c
+++ b/drivers/net/usb/sr9700.c
@@ -29,7 +29,7 @@ static int sr_read(struct usbnet *dev, u8 reg, u16 length,
void *data)
int err;
err = usbnet_read_cmd(dev, SR_RD_REGS, SR_REQ_RD_REG,
- 0, reg, data, length);
+ 0, reg, data, length);
if ((err != length) && (err >= 0))
err = -EINVAL;
return err;
@@ -40,7 +40,7 @@ static int sr_write(struct usbnet *dev, u8 reg, u16 length,
void *data)
int err;
err = usbnet_write_cmd(dev, SR_WR_REGS, SR_REQ_WR_REG,
- 0, reg, data, length);
+0, reg, data, length);
if ((err >= 0) && (err < length))
err = -EINVAL;
return err;
@@ -54,19 +54,19 @@ static int sr_read_reg(struct usbnet *dev, u8 reg, u8
*value)
static int sr_write_reg(struct usbnet *dev, u8 reg, u8 value)
{
return usbnet_write_cmd(dev, SR_WR_REGS, SR_REQ_WR_REG,
- value, reg, NULL, 0);
+ value, reg, NULL, 0);
}
static void sr_write_async(struct usbnet *dev, u8 reg, u16 length, void *data)
{
usbnet_write_cmd_async(dev, SR_WR_REGS, SR_REQ_WR_REG,
- 0, reg, data, length);
+0, reg, data, length);
}
static void sr_write_reg_async(struct usbnet *dev, u8 reg, u8 value)
{
usbnet_write_cmd_async(dev, SR_WR_REGS, SR_REQ_WR_REG,
- value, reg, NULL, 0);
+value, reg, NULL, 0);
}
static int wait_phy_eeprom_ready(struct usbnet *dev, int phy)
@@ -89,7 +89,7 @@ static int wait_phy_eeprom_ready(struct usbnet *dev, int phy)
if (i >= SR_SHARE_TIMEOUT) {
netdev_err(dev->net, "%s write timed out!\n",
- phy ? "phy" : "eeprom");
+phy ? "phy" : "eeprom");
ret = -EIO;
goto out;
}
@@ -98,7 +98,8 @@ out:
return ret;
}
-static int sr_share_read_word(struct usbnet *dev, int phy, u8 reg, __le16
*value)
+static int sr_share_read_word(struct usbnet *dev, int phy, u8 reg,
+ __le16 *value)
{
int ret;
@@ -115,14 +116,15 @@ static int sr_share_read_word(struct usbnet *dev, int
phy, u8 reg, __le16 *value
ret = sr_read(dev, EPDR, 2, value);
netdev_dbg(dev->net, "read shared %d 0x%02x returned 0x%04x, %d\n",
- phy, reg, *value, ret);
+phy, reg, *value, ret);
out:
mutex_unlock(>phy_mutex);
return ret;
}
-static int sr_share_write_word(struct usbnet *dev, int phy, u8 reg, __le16
value)
+static int sr_share_write_word(struct usbnet *dev, int phy, u8 reg,
+__le16 value)
{
int ret;
@@ -156,7 +158,8 @@ static int sr9700_get_eeprom_len(struct net_device *dev)
return SR_EEPROM_LEN;
}
-static int sr9700_get_eeprom(struct net_device *net, struct ethtool_eeprom
*eeprom, u8 *data)
+static int sr9700_get_eeprom(struct net_device *net,
+ struct ethtool_eeprom *eeprom, u8 *data)
{
struct usbnet *dev = netdev_priv(net);
__le16 *ebuf = (__le16 *)data;
@@ -168,7 +171,8 @@ static int sr9700_get_eeprom(struct net_device *net, struct
ethtool_eeprom *eepr
return -EINVAL;
for (i = 0; i < eeprom->len / 2; i++)
- ret = sr_read_eeprom_word(dev, eeprom->offset / 2 + i, [i]);
+ ret = sr_read_eeprom_word(dev, eeprom->offset / 2 + i,
+ [i]);
return ret;
}
@@ -199,12 +203,13 @@ static int sr_mdio_read(struct net_device *netdev, int
phy_id, int loc)
res = le16_to_cpu(res) & ~BMSR_LSTATUS;
netdev_dbg(dev->net, "sr_mdio_read() phy_id=0x%02x, loc=0x%02x,
returns=0x%04x\n",
- phy_id, loc, res);
+phy_id, loc, res);
return res;
}
-static void sr_mdio_write(struct net_device *netdev, int phy_id, int loc, int
val)
+static void sr_mdio_write(struct net_device *netdev, int phy_id, int loc,
+ int val)
{
struct usbnet *dev = netdev_priv(netdev);
__le16 res = cpu_to_le16(val);
@@ -215,7 +220,7 @@ static void sr_mdio_write(struct net_device *netdev, int
phy_id, int loc, int va
}
netdev_dbg(dev->net, "sr_mdio_write() phy_id=0x%02x, loc=0x%02x,
val=0x%04x\n",
- phy_id, loc, val);
+phy_id, loc, val);
sr_share_write_word(dev, 1, loc, res);
}
@@ -242,15 +247,15 @@ static int sr9700_ioctl(struct net_device *net, struct
ifreq *rq, int cmd)
}
static const struct ethtool_ops
Re: Re: [PATCH] USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support
On Mon, 2013-08-26 at 10:14 +0800, liujunliang_ljl wrote: > do you need me to merge the patch and re-send it again. I do not. > And which version of kernel will release this driver. No idea. That's up to David Miller or Greg KH to pick up the driver and maybe take the follow-on patch I sent. I just sent the patch because you seemed to have a bit of difficulty integrating the suggestions others were giving you. > Thanks a lot and apologizing for making you trouble. Oh, no worries. It was a trifle. cheers, Joe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Re: [PATCH] USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support
On Mon, 2013-08-26 at 10:14 +0800, liujunliang_ljl wrote: do you need me to merge the patch and re-send it again. I do not. And which version of kernel will release this driver. No idea. That's up to David Miller or Greg KH to pick up the driver and maybe take the follow-on patch I sent. I just sent the patch because you seemed to have a bit of difficulty integrating the suggestions others were giving you. Thanks a lot and apologizing for making you trouble. Oh, no worries. It was a trifle. cheers, Joe -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Re: [PATCH] USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support
DearJoe :
I'm sorry to ask you that, do you need me to merge the
patch and re-send it again.
And which version of kernel will release this driver.
Thanks a lot and apologizing for making you trouble.
Thanks again.
2013-08-26
liujunliang_ljl
发件人： Joe Perches
发送时间： 2013-08-25 02:15:19
收件人： liujunliang_ljl
抄送： davem; horms; romieu; gregkh; netdev; linux-usb; linux-kernel; sunhecheng
主题： Re: [PATCH] USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver
Support
Some whitespace and neatening fixups.
Some conversions from 4 indent tabs to normal tabs
Signed-off-by: Joe Perches j...@perches.com
---
Just doing this instead of commenting about spacing
again.
drivers/net/usb/sr9700.c | 127 +--
1 file changed, 67 insertions(+), 60 deletions(-)
diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c
index 27c86ec..4262b9d 100644
--- a/drivers/net/usb/sr9700.c
+++ b/drivers/net/usb/sr9700.c
@@ -29,7 +29,7 @@ static int sr_read(struct usbnet *dev, u8 reg, u16 length,
void *data)
int err;
err = usbnet_read_cmd(dev, SR_RD_REGS, SR_REQ_RD_REG,
- 0, reg, data, length);
+ 0, reg, data, length);
if ((err != length) (err = 0))
err = -EINVAL;
return err;
@@ -40,7 +40,7 @@ static int sr_write(struct usbnet *dev, u8 reg, u16 length,
void *data)
int err;
err = usbnet_write_cmd(dev, SR_WR_REGS, SR_REQ_WR_REG,
- 0, reg, data, length);
+0, reg, data, length);
if ((err = 0) (err length))
err = -EINVAL;
return err;
@@ -54,19 +54,19 @@ static int sr_read_reg(struct usbnet *dev, u8 reg, u8
*value)
static int sr_write_reg(struct usbnet *dev, u8 reg, u8 value)
{
return usbnet_write_cmd(dev, SR_WR_REGS, SR_REQ_WR_REG,
- value, reg, NULL, 0);
+ value, reg, NULL, 0);
}
static void sr_write_async(struct usbnet *dev, u8 reg, u16 length, void *data)
{
usbnet_write_cmd_async(dev, SR_WR_REGS, SR_REQ_WR_REG,
- 0, reg, data, length);
+0, reg, data, length);
}
static void sr_write_reg_async(struct usbnet *dev, u8 reg, u8 value)
{
usbnet_write_cmd_async(dev, SR_WR_REGS, SR_REQ_WR_REG,
- value, reg, NULL, 0);
+value, reg, NULL, 0);
}
static int wait_phy_eeprom_ready(struct usbnet *dev, int phy)
@@ -89,7 +89,7 @@ static int wait_phy_eeprom_ready(struct usbnet *dev, int phy)
if (i = SR_SHARE_TIMEOUT) {
netdev_err(dev-net, %s write timed out!\n,
- phy ? phy : eeprom);
+phy ? phy : eeprom);
ret = -EIO;
goto out;
}
@@ -98,7 +98,8 @@ out:
return ret;
}
-static int sr_share_read_word(struct usbnet *dev, int phy, u8 reg, __le16
*value)
+static int sr_share_read_word(struct usbnet *dev, int phy, u8 reg,
+ __le16 *value)
{
int ret;
@@ -115,14 +116,15 @@ static int sr_share_read_word(struct usbnet *dev, int
phy, u8 reg, __le16 *value
ret = sr_read(dev, EPDR, 2, value);
netdev_dbg(dev-net, read shared %d 0x%02x returned 0x%04x, %d\n,
- phy, reg, *value, ret);
+phy, reg, *value, ret);
out:
mutex_unlock(dev-phy_mutex);
return ret;
}
-static int sr_share_write_word(struct usbnet *dev, int phy, u8 reg, __le16
value)
+static int sr_share_write_word(struct usbnet *dev, int phy, u8 reg,
+__le16 value)
{
int ret;
@@ -156,7 +158,8 @@ static int sr9700_get_eeprom_len(struct net_device *dev)
return SR_EEPROM_LEN;
}
-static int sr9700_get_eeprom(struct net_device *net, struct ethtool_eeprom
*eeprom, u8 *data)
+static int sr9700_get_eeprom(struct net_device *net,
+ struct ethtool_eeprom *eeprom, u8 *data)
{
struct usbnet *dev = netdev_priv(net);
__le16 *ebuf = (__le16 *)data;
@@ -168,7 +171,8 @@ static int sr9700_get_eeprom(struct net_device *net, struct
ethtool_eeprom *eepr
return -EINVAL;
for (i = 0; i eeprom-len / 2; i++)
- ret = sr_read_eeprom_word(dev, eeprom-offset / 2 + i, ebuf[i]);
+ ret = sr_read_eeprom_word(dev, eeprom-offset / 2 + i,
+ ebuf[i]);
return ret;
}
@@ -199,12 +203,13 @@ static int sr_mdio_read(struct net_device *netdev, int
phy_id, int loc)
res = le16_to_cpu(res) ~BMSR_LSTATUS;
netdev_dbg(dev-net, sr_mdio_read() phy_id=0x%02x, loc=0x%02x,
returns=0x%04x\n,
- phy_id, loc, res);
+phy_id, loc, res);
return res;
}
-static void sr_mdio_write(struct net_device *netdev, int phy_id, int loc, int
val)
+static void sr_mdio_write(struct net_device *netdev, int phy_id, int loc,
+ int val)
{
struct usbnet *dev = netdev_priv(netdev);
__le16 res = cpu_to_le16(val);
@@ -215,7 +220,7 @@ static void sr_mdio_write(struct net_device *netdev, int
phy_id, int loc, int va
}
netdev_dbg(dev-net, sr_mdio_write() phy_id=0x%02x, loc=0x%02x,
val=0x%04x\n,
- phy_id, loc, val);
+phy_id, loc, val);
sr_share_write_word(dev, 1, loc, res);
}
@@ -242,15 +247,15 @@ static int sr9700_ioctl(struct net_device *net, struct
ifreq *rq, int cmd)
}
static const struct ethtool_ops
