mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/ata/sata_sil.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *  sata_sil.c - Silicon Image SATA
3
4
  *
..
..
@@ -8,22 +9,6 @@
8
9
  *  Copyright 2003-2005 Red Hat, Inc.
9
10
  *  Copyright 2003 Benjamin Herrenschmidt
10
11
  *
11
- *
12
- *  This program is free software; you can redistribute it and/or modify
13
- *  it under the terms of the GNU General Public License as published by
14
- *  the Free Software Foundation; either version 2, or (at your option)
15
- *  any later version.
16
- *
17
- *  This program is distributed in the hope that it will be useful,
18
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
19
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
20
- *  GNU General Public License for more details.
21
- *
22
- *  You should have received a copy of the GNU General Public License
23
- *  along with this program; see the file COPYING.  If not, write to
24
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
25
- *
26
- *
27
12
  *  libata documentation is available via 'make {ps|pdf}docs',
28
13
  *  as Documentation/driver-api/libata.rst
29
14
  *
..
..
@@ -31,7 +16,6 @@
31
16
  *  http://gkernel.sourceforge.net/specs/sii/3112A_SiI-DS-0095-B2.pdf.bz2
32
17
  *
33
18
  *  Other errata and documentation available under NDA.
34
- *
35
19
  */
36
20
 
37
21
 #include <linux/kernel.h>
..
..
@@ -775,10 +759,7 @@
775
759
 		return rc;
776
760
 	host->iomap = pcim_iomap_table(pdev);
777
761
 
778
-	rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
779
-	if (rc)
780
-		return rc;
781
-	rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
762
+	rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK);
782
763
 	if (rc)
783
764
 		return rc;
784
765