mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/ata/ata_piix.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *    ata_piix.c - Intel PATA/SATA controllers
3
4
  *
..
..
@@ -5,32 +6,14 @@
5
6
  *    		    Please ALWAYS copy linux-ide@vger.kernel.org
6
7
  *		    on emails.
7
8
  *
8
- *
9
9
  *	Copyright 2003-2005 Red Hat Inc
10
10
  *	Copyright 2003-2005 Jeff Garzik
11
- *
12
11
  *
13
12
  *	Copyright header from piix.c:
14
13
  *
15
14
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
16
15
  *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
17
16
  *  Copyright (C) 2003 Red Hat Inc
18
- *
19
- *
20
- *  This program is free software; you can redistribute it and/or modify
21
- *  it under the terms of the GNU General Public License as published by
22
- *  the Free Software Foundation; either version 2, or (at your option)
23
- *  any later version.
24
- *
25
- *  This program is distributed in the hope that it will be useful,
26
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
27
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
28
- *  GNU General Public License for more details.
29
- *
30
- *  You should have received a copy of the GNU General Public License
31
- *  along with this program; see the file COPYING.  If not, write to
32
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
33
- *
34
17
  *
35
18
  *  libata documentation is available via 'make {ps|pdf}docs',
36
19
  *  as Documentation/driver-api/libata.rst
..
..
@@ -858,6 +841,12 @@
858
841
 			},
859
842
 		},
860
843
 		{
844
+			.ident = "TECRA M3",
845
+			.matches = {
846
+				DMI_MATCH(DMI_OEM_STRING, "Tecra M3,"),
847
+			},
848
+		},
849
+		{
861
850
 			.ident = "TECRA M4",
862
851
 			.matches = {
863
852
 				DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
..
..
@@ -972,17 +961,9 @@
972
961
 
973
962
 		{ }	/* terminate list */
974
963
 	};
975
-	static const char *oemstrs[] = {
976
-		"Tecra M3,",
977
-	};
978
-	int i;
979
964
 
980
965
 	if (dmi_check_system(sysids))
981
966
 		return 1;
982
-
983
-	for (i = 0; i < ARRAY_SIZE(oemstrs); i++)
984
-		if (dmi_find_device(DMI_DEV_TYPE_OEM_STRING, oemstrs[i], NULL))
985
-			return 1;
986
967
 
987
968
 	/* TECRA M4 sometimes forgets its identify and reports bogus
988
969
 	 * DMI information.  As the bogus information is a bit