This patch series contains some minor improvements for the lan78xx
driver.
Stefan Wahren (4):
net: lan78xx: Bail out if lan78xx_get_endpoints fails
net: lan78xx: Drop unnecessary strcpy in lan78xx_probe
net: lan78xx: Switch to SPDX identifier
net: lan78xx: Make declaration style consistent
drivers/net/usb/lan78xx.c | 38 ++++++++++++++------------------------
drivers/net/usb/lan78xx.h | 18 ++----------------
2 files changed, 16 insertions(+), 40 deletions(-)
--
2.7.4
This patch makes some declaration more consistent.
Signed-off-by: Stefan Wahren <[email protected]>
---
drivers/net/usb/lan78xx.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index a6e88a4..143091a 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -1013,7 +1013,7 @@ static int lan78xx_dataport_write(struct lan78xx_net *dev, u32 ram_select,
static void lan78xx_set_addr_filter(struct lan78xx_priv *pdata,
int index, u8 addr[ETH_ALEN])
{
- u32 temp;
+ u32 temp;
if ((pdata) && (index > 0) && (index < NUM_OF_MAF)) {
temp = addr[3];
@@ -2688,7 +2688,7 @@ static void lan78xx_terminate_urbs(struct lan78xx_net *dev)
static int lan78xx_stop(struct net_device *net)
{
- struct lan78xx_net *dev = netdev_priv(net);
+ struct lan78xx_net *dev = netdev_priv(net);
if (timer_pending(&dev->stat_monitor))
del_timer_sync(&dev->stat_monitor);
@@ -3071,7 +3071,7 @@ static void lan78xx_rx_vlan_offload(struct lan78xx_net *dev,
static void lan78xx_skb_return(struct lan78xx_net *dev, struct sk_buff *skb)
{
- int status;
+ int status;
if (test_bit(EVENT_RX_PAUSED, &dev->flags)) {
skb_queue_tail(&dev->rxq_pause, skb);
@@ -3631,10 +3631,10 @@ static void intr_complete(struct urb *urb)
static void lan78xx_disconnect(struct usb_interface *intf)
{
- struct lan78xx_net *dev;
- struct usb_device *udev;
- struct net_device *net;
- struct phy_device *phydev;
+ struct lan78xx_net *dev;
+ struct usb_device *udev;
+ struct net_device *net;
+ struct phy_device *phydev;
dev = usb_get_intfdata(intf);
usb_set_intfdata(intf, NULL);
--
2.7.4
There is no need for this strcpy because alloc_etherdev() already
does this job.
Signed-off-by: Stefan Wahren <[email protected]>
---
drivers/net/usb/lan78xx.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 3f70b94..3d505c2 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -3766,7 +3766,6 @@ static int lan78xx_probe(struct usb_interface *intf,
ret = lan78xx_bind(dev, intf);
if (ret < 0)
goto out2;
- strcpy(netdev->name, "eth%d");
if (netdev->mtu > (dev->hard_mtu - netdev->hard_header_len))
netdev->mtu = dev->hard_mtu - netdev->hard_header_len;
--
2.7.4
We need to bail out if lan78xx_get_endpoints() fails, otherwise the
result is overwritten.
Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet")
Signed-off-by: Stefan Wahren <[email protected]>
---
drivers/net/usb/lan78xx.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index a9991c5..3f70b94 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -2952,6 +2952,11 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)
int i;
ret = lan78xx_get_endpoints(dev, intf);
+ if (ret) {
+ netdev_warn(dev->net, "lan78xx_get_endpoints failed: %d\n",
+ ret);
+ return ret;
+ }
dev->data[0] = (unsigned long)kzalloc(sizeof(*pdata), GFP_KERNEL);
--
2.7.4
Adopt the SPDX license identifier headers to ease license compliance
management.
Signed-off-by: Stefan Wahren <[email protected]>
---
drivers/net/usb/lan78xx.c | 18 ++----------------
drivers/net/usb/lan78xx.h | 18 ++----------------
2 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 3d505c2..a6e88a4 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (C) 2015 Microchip Technology
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-2.0+
+/* Copyright (C) 2015 Microchip Technology */
#include <linux/version.h>
#include <linux/module.h>
#include <linux/netdevice.h>
diff --git a/drivers/net/usb/lan78xx.h b/drivers/net/usb/lan78xx.h
index 25aa546..e65cb54 100644
--- a/drivers/net/usb/lan78xx.h
+++ b/drivers/net/usb/lan78xx.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (C) 2015 Microchip Technology
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
+/* SPDX-License-Identifier: GPL-2.0+ */
+/* Copyright (C) 2015 Microchip Technology */
#ifndef _LAN78XX_H
#define _LAN78XX_H
--
2.7.4
> We need to bail out if lan78xx_get_endpoints() fails, otherwise the result is
> overwritten.
>
> Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000
> Ethernet")
> Signed-off-by: Stefan Wahren <[email protected]>
Reviewed-by: Raghuram Chary Jallipalli <[email protected]>
Thanks,
-Raghu
> There is no need for this strcpy because alloc_etherdev() already does this
> job.
>
> Signed-off-by: Stefan Wahren <[email protected]>
Reviewed-by: Raghuram Chary Jallipalli <[email protected]>
Thanks,
-Raghu
> This patch makes some declaration more consistent.
>
> Signed-off-by: Stefan Wahren <[email protected]>
Reviewed-by: Raghuram Chary Jallipalli <[email protected]>
Thanks,
-Raghu
> +// SPDX-License-Identifier: GPL-2.0+
> +/* Copyright (C) 2015 Microchip Technology */
Can we merge both in single comment line?
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +/* Copyright (C) 2015 Microchip Technology */
Here too.
Thanks,
-Raghu
Hi Raghu,
Am 04.09.2018 um 06:29 schrieb [email protected]:
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/* Copyright (C) 2015 Microchip Technology */
> Can we merge both in single comment line?
i don't think we can do this. I'm simply following this guideline [1].
How about this:
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2015 Microchip Technology
*/
[1] - https://www.kernel.org/doc/html/v4.18/process/license-rules.html
>
>> +/* SPDX-License-Identifier: GPL-2.0+ */
>> +/* Copyright (C) 2015 Microchip Technology */
> Here too.
>
> Thanks,
> -Raghu
> i don't think we can do this. I'm simply following this guideline [1].
>
> How about this:
>
> // SPDX-License-Identifier: GPL-2.0+
> /*
> * Copyright (C) 2015 Microchip Technology
> */
>
> [1] - https://www.kernel.org/doc/html/v4.18/process/license-rules.html
>
Thank you.
Looks good to me.
Thanks,
-Raghu