add r8169 read mac form eeprom

hc

2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd

 kernel/drivers/scsi/libsas/sas_phy.c
..
..
@@ -1,25 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0
1
2
 /*
2
3
  * Serial Attached SCSI (SAS) Phy class
3
4
  *
4
5
  * Copyright (C) 2005 Adaptec, Inc.  All rights reserved.
5
6
  * Copyright (C) 2005 Luben Tuikov <luben_tuikov@adaptec.com>
6
- *
7
- * This file is licensed under GPLv2.
8
- *
9
- * This program is free software; you can redistribute it and/or
10
- * modify it under the terms of the GNU General Public License as
11
- * published by the Free Software Foundation; either version 2 of the
12
- * License, or (at your option) any later version.
13
- *
14
- * This program is distributed in the hope that it will be useful, but
15
- * WITHOUT ANY WARRANTY; without even the implied warranty of
16
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
17
- * General Public License for more details.
18
- *
19
- * You should have received a copy of the GNU General Public License
20
- * along with this program; if not, write to the Free Software
21
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
22
- *
23
7
  */
24
8
 
25
9
 #include "sas_internal.h"
..
..
@@ -35,7 +19,6 @@
35
19
 	struct asd_sas_event *ev = to_asd_sas_event(work);
36
20
 	struct asd_sas_phy *phy = ev->phy;
37
21
 
38
-	phy->in_shutdown = 0;
39
22
 	phy->error = 0;
40
23
 	sas_deform_port(phy, 1);
41
24
 }
..
..
@@ -45,7 +28,6 @@
45
28
 	struct asd_sas_event *ev = to_asd_sas_event(work);
46
29
 	struct asd_sas_phy *phy = ev->phy;
47
30
 
48
-	phy->in_shutdown = 0;
49
31
 	phy->error = 0;
50
32
 }
51
33
 
..
..
@@ -122,11 +104,11 @@
122
104
 		phy->enabled = 0;
123
105
 		ret = i->dft->lldd_control_phy(phy, PHY_FUNC_DISABLE, NULL);
124
106
 		if (ret)
125
-			sas_printk("lldd disable phy%02d returned %d\n",
126
-				phy->id, ret);
107
+			pr_notice("lldd disable phy%d returned %d\n", phy->id,
108
+				  ret);
127
109
 	} else
128
-		sas_printk("phy%02d is not enabled, cannot shutdown\n",
129
-			phy->id);
110
+		pr_notice("phy%d is not enabled, cannot shutdown\n", phy->id);
111
+	phy->in_shutdown = 0;
130
112
 }
131
113
 
132
114
 /* ---------- Phy class registration ---------- */