aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-01-10 03:41:44 -0500
committerTejun Heo <tj@kernel.org>2017-01-10 10:55:39 -0500
commitf0a37d12f51a51d61f68dd30123f2b1927b56bb6 (patch)
treef045ab55e17963a3725b500637ee768a3ec46fd3
parentaa18da8b7ec57f6ff255634746aed6266a01b315 (diff)
libata: move struct ata_scsi_args to libata-scsi.c
It's only used in libata-scsi.c, so move it closer to the users. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--drivers/ata/libata-scsi.c7
-rw-r--r--drivers/ata/libata.h7
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 031a77aae19d..43694f5f2c89 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2057,6 +2057,13 @@ defer:
2057 return SCSI_MLQUEUE_HOST_BUSY; 2057 return SCSI_MLQUEUE_HOST_BUSY;
2058} 2058}
2059 2059
2060struct ata_scsi_args {
2061 struct ata_device *dev;
2062 u16 *id;
2063 struct scsi_cmnd *cmd;
2064 void (*done)(struct scsi_cmnd *);
2065};
2066
2060/** 2067/**
2061 * ata_scsi_rbuf_get - Map response buffer. 2068 * ata_scsi_rbuf_get - Map response buffer.
2062 * @cmd: SCSI command containing buffer to be mapped. 2069 * @cmd: SCSI command containing buffer to be mapped.
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 1133e9439f9c..bba39a62552b 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -31,13 +31,6 @@
31#define DRV_NAME "libata" 31#define DRV_NAME "libata"
32#define DRV_VERSION "3.00" /* must be exactly four chars */ 32#define DRV_VERSION "3.00" /* must be exactly four chars */
33 33
34struct ata_scsi_args {
35 struct ata_device *dev;
36 u16 *id;
37 struct scsi_cmnd *cmd;
38 void (*done)(struct scsi_cmnd *);
39};
40
41/* libata-core.c */ 34/* libata-core.c */
42enum { 35enum {
43 /* flags for ata_dev_read_id() */ 36 /* flags for ata_dev_read_id() */