disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/net/ethernet/microchip/encx24j600.c
..
..
@@ -1,14 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /**
2
3
  * Microchip ENCX24J600 ethernet driver
3
4
  *
4
5
  * Copyright (C) 2015 Gridpoint
5
6
  * Author: Jon Ringle <jringle@gridpoint.com>
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License as published by
9
- * the Free Software Foundation; either version 2 of the License, or
10
- * (at your option) any later version.
11
- *
12
7
  */
13
8
 
14
9
 #include <linux/device.h>
..
..
@@ -609,9 +604,8 @@
609
604
 	}
610
605
 }
611
606
 
612
-static int encx24j600_hw_init(struct encx24j600_priv *priv)
607
+static void encx24j600_hw_init(struct encx24j600_priv *priv)
613
608
 {
614
-	int ret = 0;
615
609
 	u16 macon2;
616
610
 
617
611
 	priv->hw_enabled = false;
..
..
@@ -654,8 +648,6 @@
654
648
 
655
649
 	if (netif_msg_hw(priv))
656
650
 		encx24j600_dump_config(priv, "Hw is initialized");
657
-
658
-	return ret;
659
651
 }
660
652
 
661
653
 static void encx24j600_hw_enable(struct encx24j600_priv *priv)
..
..
@@ -897,7 +889,7 @@
897
889
 }
898
890
 
899
891
 /* Deal with a transmit timeout */
900
-static void encx24j600_tx_timeout(struct net_device *dev)
892
+static void encx24j600_tx_timeout(struct net_device *dev, unsigned int txqueue)
901
893
 {
902
894
 	struct encx24j600_priv *priv = netdev_priv(dev);
903
895
 
..
..
@@ -1050,12 +1042,7 @@
1050
1042
 	}
1051
1043
 
1052
1044
 	/* Initialize the device HW to the consistent state */
1053
-	if (encx24j600_hw_init(priv)) {
1054
-		netif_err(priv, probe, ndev,
1055
-			  DRV_NAME ": HW initialization error\n");
1056
-		ret = -EIO;
1057
-		goto out_free;
1058
-	}
1045
+	encx24j600_hw_init(priv);
1059
1046
 
1060
1047
 	kthread_init_worker(&priv->kworker);
1061
1048
 	kthread_init_work(&priv->tx_work, encx24j600_tx_proc);