aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-07 00:59:37 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-07 00:59:37 -0500
commit193515d51ccb363165d6b09e9ba5c21089e34bad (patch)
tree9eec151ee1c2091640862adf79f99eca024a98f1 /drivers/scsi
parent0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (diff)
[libata] eliminate use of drivers/scsi/scsi.h compatibility header/defines
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ahci.c4
-rw-r--r--drivers/scsi/ata_piix.c3
-rw-r--r--drivers/scsi/libata-core.c2
-rw-r--r--drivers/scsi/libata-scsi.c2
-rw-r--r--drivers/scsi/pdc_adma.c3
-rw-r--r--drivers/scsi/sata_mv.c4
-rw-r--r--drivers/scsi/sata_nv.c3
-rw-r--r--drivers/scsi/sata_promise.c4
-rw-r--r--drivers/scsi/sata_qstor.c3
-rw-r--r--drivers/scsi/sata_sil.c3
-rw-r--r--drivers/scsi/sata_sil24.c4
-rw-r--r--drivers/scsi/sata_sis.c3
-rw-r--r--drivers/scsi/sata_svw.c3
-rw-r--r--drivers/scsi/sata_sx4.c4
-rw-r--r--drivers/scsi/sata_uli.c3
-rw-r--r--drivers/scsi/sata_via.c3
-rw-r--r--drivers/scsi/sata_vsc.c3
17 files changed, 22 insertions, 32 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 4612312c0c2d..10c470e7d316 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -42,8 +42,8 @@
42#include <linux/sched.h> 42#include <linux/sched.h>
43#include <linux/dma-mapping.h> 43#include <linux/dma-mapping.h>
44#include <linux/device.h> 44#include <linux/device.h>
45#include "scsi.h"
46#include <scsi/scsi_host.h> 45#include <scsi/scsi_host.h>
46#include <scsi/scsi_cmnd.h>
47#include <linux/libata.h> 47#include <linux/libata.h>
48#include <asm/io.h> 48#include <asm/io.h>
49 49
@@ -196,7 +196,7 @@ static u8 ahci_check_status(struct ata_port *ap);
196static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); 196static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
197static void ahci_remove_one (struct pci_dev *pdev); 197static void ahci_remove_one (struct pci_dev *pdev);
198 198
199static Scsi_Host_Template ahci_sht = { 199static struct scsi_host_template ahci_sht = {
200 .module = THIS_MODULE, 200 .module = THIS_MODULE,
201 .name = DRV_NAME, 201 .name = DRV_NAME,
202 .ioctl = ata_scsi_ioctl, 202 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 7f8aa1b552ce..a1bd8d95623c 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -46,7 +46,6 @@
46#include <linux/blkdev.h> 46#include <linux/blkdev.h>
47#include <linux/delay.h> 47#include <linux/delay.h>
48#include <linux/device.h> 48#include <linux/device.h>
49#include "scsi.h"
50#include <scsi/scsi_host.h> 49#include <scsi/scsi_host.h>
51#include <linux/libata.h> 50#include <linux/libata.h>
52 51
@@ -128,7 +127,7 @@ static struct pci_driver piix_pci_driver = {
128 .remove = ata_pci_remove_one, 127 .remove = ata_pci_remove_one,
129}; 128};
130 129
131static Scsi_Host_Template piix_sht = { 130static struct scsi_host_template piix_sht = {
132 .module = THIS_MODULE, 131 .module = THIS_MODULE,
133 .name = DRV_NAME, 132 .name = DRV_NAME,
134 .ioctl = ata_scsi_ioctl, 133 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 1c1a7caf785e..98769a3d31ae 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -51,8 +51,8 @@
51#include <linux/jiffies.h> 51#include <linux/jiffies.h>
52#include <linux/scatterlist.h> 52#include <linux/scatterlist.h>
53#include <scsi/scsi.h> 53#include <scsi/scsi.h>
54#include "scsi.h"
55#include "scsi_priv.h" 54#include "scsi_priv.h"
55#include <scsi/scsi_cmnd.h>
56#include <scsi/scsi_host.h> 56#include <scsi/scsi_host.h>
57#include <linux/libata.h> 57#include <linux/libata.h>
58#include <asm/io.h> 58#include <asm/io.h>
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index eb604b0a8990..38a895ebe826 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -37,9 +37,9 @@
37#include <linux/blkdev.h> 37#include <linux/blkdev.h>
38#include <linux/spinlock.h> 38#include <linux/spinlock.h>
39#include <scsi/scsi.h> 39#include <scsi/scsi.h>
40#include "scsi.h"
41#include <scsi/scsi_host.h> 40#include <scsi/scsi_host.h>
42#include <scsi/scsi_device.h> 41#include <scsi/scsi_device.h>
42#include <scsi/scsi_request.h>
43#include <linux/libata.h> 43#include <linux/libata.h>
44#include <linux/hdreg.h> 44#include <linux/hdreg.h>
45#include <asm/uaccess.h> 45#include <asm/uaccess.h>
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index a50588c60fab..78b4ff117af6 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -41,7 +41,6 @@
41#include <linux/interrupt.h> 41#include <linux/interrupt.h>
42#include <linux/sched.h> 42#include <linux/sched.h>
43#include <linux/device.h> 43#include <linux/device.h>
44#include "scsi.h"
45#include <scsi/scsi_host.h> 44#include <scsi/scsi_host.h>
46#include <asm/io.h> 45#include <asm/io.h>
47#include <linux/libata.h> 46#include <linux/libata.h>
@@ -139,7 +138,7 @@ static u8 adma_bmdma_status(struct ata_port *ap);
139static void adma_irq_clear(struct ata_port *ap); 138static void adma_irq_clear(struct ata_port *ap);
140static void adma_eng_timeout(struct ata_port *ap); 139static void adma_eng_timeout(struct ata_port *ap);
141 140
142static Scsi_Host_Template adma_ata_sht = { 141static struct scsi_host_template adma_ata_sht = {
143 .module = THIS_MODULE, 142 .module = THIS_MODULE,
144 .name = DRV_NAME, 143 .name = DRV_NAME,
145 .ioctl = ata_scsi_ioctl, 144 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 0f469e3dabe2..93d55233af7b 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -30,8 +30,8 @@
30#include <linux/sched.h> 30#include <linux/sched.h>
31#include <linux/dma-mapping.h> 31#include <linux/dma-mapping.h>
32#include <linux/device.h> 32#include <linux/device.h>
33#include "scsi.h"
34#include <scsi/scsi_host.h> 33#include <scsi/scsi_host.h>
34#include <scsi/scsi_cmnd.h>
35#include <linux/libata.h> 35#include <linux/libata.h>
36#include <asm/io.h> 36#include <asm/io.h>
37 37
@@ -270,7 +270,7 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance,
270static void mv_eng_timeout(struct ata_port *ap); 270static void mv_eng_timeout(struct ata_port *ap);
271static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); 271static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
272 272
273static Scsi_Host_Template mv_sht = { 273static struct scsi_host_template mv_sht = {
274 .module = THIS_MODULE, 274 .module = THIS_MODULE,
275 .name = DRV_NAME, 275 .name = DRV_NAME,
276 .ioctl = ata_scsi_ioctl, 276 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index d573888eda76..37a4fae95ed4 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -62,7 +62,6 @@
62#include <linux/delay.h> 62#include <linux/delay.h>
63#include <linux/interrupt.h> 63#include <linux/interrupt.h>
64#include <linux/device.h> 64#include <linux/device.h>
65#include "scsi.h"
66#include <scsi/scsi_host.h> 65#include <scsi/scsi_host.h>
67#include <linux/libata.h> 66#include <linux/libata.h>
68 67
@@ -219,7 +218,7 @@ static struct pci_driver nv_pci_driver = {
219 .remove = ata_pci_remove_one, 218 .remove = ata_pci_remove_one,
220}; 219};
221 220
222static Scsi_Host_Template nv_sht = { 221static struct scsi_host_template nv_sht = {
223 .module = THIS_MODULE, 222 .module = THIS_MODULE,
224 .name = DRV_NAME, 223 .name = DRV_NAME,
225 .ioctl = ata_scsi_ioctl, 224 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index b41c977d6fab..9edc9d91efc3 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -39,8 +39,8 @@
39#include <linux/interrupt.h> 39#include <linux/interrupt.h>
40#include <linux/sched.h> 40#include <linux/sched.h>
41#include <linux/device.h> 41#include <linux/device.h>
42#include "scsi.h"
43#include <scsi/scsi_host.h> 42#include <scsi/scsi_host.h>
43#include <scsi/scsi_cmnd.h>
44#include <linux/libata.h> 44#include <linux/libata.h>
45#include <asm/io.h> 45#include <asm/io.h>
46#include "sata_promise.h" 46#include "sata_promise.h"
@@ -94,7 +94,7 @@ static void pdc_irq_clear(struct ata_port *ap);
94static int pdc_qc_issue_prot(struct ata_queued_cmd *qc); 94static int pdc_qc_issue_prot(struct ata_queued_cmd *qc);
95 95
96 96
97static Scsi_Host_Template pdc_ata_sht = { 97static struct scsi_host_template pdc_ata_sht = {
98 .module = THIS_MODULE, 98 .module = THIS_MODULE,
99 .name = DRV_NAME, 99 .name = DRV_NAME,
100 .ioctl = ata_scsi_ioctl, 100 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 65502c157a54..d274ab235781 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -36,7 +36,6 @@
36#include <linux/interrupt.h> 36#include <linux/interrupt.h>
37#include <linux/sched.h> 37#include <linux/sched.h>
38#include <linux/device.h> 38#include <linux/device.h>
39#include "scsi.h"
40#include <scsi/scsi_host.h> 39#include <scsi/scsi_host.h>
41#include <asm/io.h> 40#include <asm/io.h>
42#include <linux/libata.h> 41#include <linux/libata.h>
@@ -128,7 +127,7 @@ static u8 qs_bmdma_status(struct ata_port *ap);
128static void qs_irq_clear(struct ata_port *ap); 127static void qs_irq_clear(struct ata_port *ap);
129static void qs_eng_timeout(struct ata_port *ap); 128static void qs_eng_timeout(struct ata_port *ap);
130 129
131static Scsi_Host_Template qs_ata_sht = { 130static struct scsi_host_template qs_ata_sht = {
132 .module = THIS_MODULE, 131 .module = THIS_MODULE,
133 .name = DRV_NAME, 132 .name = DRV_NAME,
134 .ioctl = ata_scsi_ioctl, 133 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 435f7e0085ec..d0e3c3c6c25f 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -42,7 +42,6 @@
42#include <linux/delay.h> 42#include <linux/delay.h>
43#include <linux/interrupt.h> 43#include <linux/interrupt.h>
44#include <linux/device.h> 44#include <linux/device.h>
45#include "scsi.h"
46#include <scsi/scsi_host.h> 45#include <scsi/scsi_host.h>
47#include <linux/libata.h> 46#include <linux/libata.h>
48 47
@@ -131,7 +130,7 @@ static struct pci_driver sil_pci_driver = {
131 .remove = ata_pci_remove_one, 130 .remove = ata_pci_remove_one,
132}; 131};
133 132
134static Scsi_Host_Template sil_sht = { 133static struct scsi_host_template sil_sht = {
135 .module = THIS_MODULE, 134 .module = THIS_MODULE,
136 .name = DRV_NAME, 135 .name = DRV_NAME,
137 .ioctl = ata_scsi_ioctl, 136 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index e6c8e89c226f..4682a50650b4 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -37,7 +37,7 @@
37#include <linux/dma-mapping.h> 37#include <linux/dma-mapping.h>
38#include <linux/device.h> 38#include <linux/device.h>
39#include <scsi/scsi_host.h> 39#include <scsi/scsi_host.h>
40#include "scsi.h" 40#include <scsi/scsi_cmnd.h>
41#include <linux/libata.h> 41#include <linux/libata.h>
42#include <asm/io.h> 42#include <asm/io.h>
43 43
@@ -255,7 +255,7 @@ static struct pci_driver sil24_pci_driver = {
255 .remove = ata_pci_remove_one, /* safe? */ 255 .remove = ata_pci_remove_one, /* safe? */
256}; 256};
257 257
258static Scsi_Host_Template sil24_sht = { 258static struct scsi_host_template sil24_sht = {
259 .module = THIS_MODULE, 259 .module = THIS_MODULE,
260 .name = DRV_NAME, 260 .name = DRV_NAME,
261 .ioctl = ata_scsi_ioctl, 261 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index 42288be0e561..42d7c4e92501 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -39,7 +39,6 @@
39#include <linux/delay.h> 39#include <linux/delay.h>
40#include <linux/interrupt.h> 40#include <linux/interrupt.h>
41#include <linux/device.h> 41#include <linux/device.h>
42#include "scsi.h"
43#include <scsi/scsi_host.h> 42#include <scsi/scsi_host.h>
44#include <linux/libata.h> 43#include <linux/libata.h>
45 44
@@ -83,7 +82,7 @@ static struct pci_driver sis_pci_driver = {
83 .remove = ata_pci_remove_one, 82 .remove = ata_pci_remove_one,
84}; 83};
85 84
86static Scsi_Host_Template sis_sht = { 85static struct scsi_host_template sis_sht = {
87 .module = THIS_MODULE, 86 .module = THIS_MODULE,
88 .name = DRV_NAME, 87 .name = DRV_NAME,
89 .ioctl = ata_scsi_ioctl, 88 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index db615ff794d8..9895d1caefcf 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -45,7 +45,6 @@
45#include <linux/delay.h> 45#include <linux/delay.h>
46#include <linux/interrupt.h> 46#include <linux/interrupt.h>
47#include <linux/device.h> 47#include <linux/device.h>
48#include "scsi.h"
49#include <scsi/scsi_host.h> 48#include <scsi/scsi_host.h>
50#include <linux/libata.h> 49#include <linux/libata.h>
51 50
@@ -284,7 +283,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
284#endif /* CONFIG_PPC_OF */ 283#endif /* CONFIG_PPC_OF */
285 284
286 285
287static Scsi_Host_Template k2_sata_sht = { 286static struct scsi_host_template k2_sata_sht = {
288 .module = THIS_MODULE, 287 .module = THIS_MODULE,
289 .name = DRV_NAME, 288 .name = DRV_NAME,
290 .ioctl = ata_scsi_ioctl, 289 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index f859bbd681ed..d5a38784352b 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -39,8 +39,8 @@
39#include <linux/interrupt.h> 39#include <linux/interrupt.h>
40#include <linux/sched.h> 40#include <linux/sched.h>
41#include <linux/device.h> 41#include <linux/device.h>
42#include "scsi.h"
43#include <scsi/scsi_host.h> 42#include <scsi/scsi_host.h>
43#include <scsi/scsi_cmnd.h>
44#include <linux/libata.h> 44#include <linux/libata.h>
45#include <asm/io.h> 45#include <asm/io.h>
46#include "sata_promise.h" 46#include "sata_promise.h"
@@ -177,7 +177,7 @@ static void pdc20621_irq_clear(struct ata_port *ap);
177static int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc); 177static int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc);
178 178
179 179
180static Scsi_Host_Template pdc_sata_sht = { 180static struct scsi_host_template pdc_sata_sht = {
181 .module = THIS_MODULE, 181 .module = THIS_MODULE,
182 .name = DRV_NAME, 182 .name = DRV_NAME,
183 .ioctl = ata_scsi_ioctl, 183 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index a5e245c098e1..cf0baaa4e045 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -33,7 +33,6 @@
33#include <linux/delay.h> 33#include <linux/delay.h>
34#include <linux/interrupt.h> 34#include <linux/interrupt.h>
35#include <linux/device.h> 35#include <linux/device.h>
36#include "scsi.h"
37#include <scsi/scsi_host.h> 36#include <scsi/scsi_host.h>
38#include <linux/libata.h> 37#include <linux/libata.h>
39 38
@@ -71,7 +70,7 @@ static struct pci_driver uli_pci_driver = {
71 .remove = ata_pci_remove_one, 70 .remove = ata_pci_remove_one,
72}; 71};
73 72
74static Scsi_Host_Template uli_sht = { 73static struct scsi_host_template uli_sht = {
75 .module = THIS_MODULE, 74 .module = THIS_MODULE,
76 .name = DRV_NAME, 75 .name = DRV_NAME,
77 .ioctl = ata_scsi_ioctl, 76 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index b3ecdbe400e9..ab19d2ba2a4b 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -42,7 +42,6 @@
42#include <linux/blkdev.h> 42#include <linux/blkdev.h>
43#include <linux/delay.h> 43#include <linux/delay.h>
44#include <linux/device.h> 44#include <linux/device.h>
45#include "scsi.h"
46#include <scsi/scsi_host.h> 45#include <scsi/scsi_host.h>
47#include <linux/libata.h> 46#include <linux/libata.h>
48#include <asm/io.h> 47#include <asm/io.h>
@@ -90,7 +89,7 @@ static struct pci_driver svia_pci_driver = {
90 .remove = ata_pci_remove_one, 89 .remove = ata_pci_remove_one,
91}; 90};
92 91
93static Scsi_Host_Template svia_sht = { 92static struct scsi_host_template svia_sht = {
94 .module = THIS_MODULE, 93 .module = THIS_MODULE,
95 .name = DRV_NAME, 94 .name = DRV_NAME,
96 .ioctl = ata_scsi_ioctl, 95 .ioctl = ata_scsi_ioctl,
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index bb84ba0c7e83..ce8a2fd7da84 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -43,7 +43,6 @@
43#include <linux/interrupt.h> 43#include <linux/interrupt.h>
44#include <linux/dma-mapping.h> 44#include <linux/dma-mapping.h>
45#include <linux/device.h> 45#include <linux/device.h>
46#include "scsi.h"
47#include <scsi/scsi_host.h> 46#include <scsi/scsi_host.h>
48#include <linux/libata.h> 47#include <linux/libata.h>
49 48
@@ -219,7 +218,7 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance,
219} 218}
220 219
221 220
222static Scsi_Host_Template vsc_sata_sht = { 221static struct scsi_host_template vsc_sata_sht = {
223 .module = THIS_MODULE, 222 .module = THIS_MODULE,
224 .name = DRV_NAME, 223 .name = DRV_NAME,
225 .ioctl = ata_scsi_ioctl, 224 .ioctl = ata_scsi_ioctl,
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-08 15:48:22 -0500