summaryrefslogtreecommitdiff
path: root/include/linux/ide.h
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-06-13 12:00:54 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-06-13 12:00:54 +0200
commit8dcce4081305d3d1629190edd112e6473c315cbc (patch)
tree343c7167f6a3d2a77b01d50cf54c67bdd6faccd1 /include/linux/ide.h
parentf3ad116588151b3371ae4e092290e4f48e62b8bb (diff)
parent103f7033bd0f7b65ff3e0a5ea72449d08010b031 (diff)
downloadlinux-3.10-8dcce4081305d3d1629190edd112e6473c315cbc.tar.gz
linux-3.10-8dcce4081305d3d1629190edd112e6473c315cbc.tar.bz2
linux-3.10-8dcce4081305d3d1629190edd112e6473c315cbc.zip
Merge branch 'bp-remove-pc-buf' into for-next
Conflicts: drivers/ide/ide-tape.c
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r--include/linux/ide.h18
1 files changed, 4 insertions, 14 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index a6c6a2fad7c..cdb29b6c195 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -331,11 +331,6 @@ enum {
PC_FLAG_WRITING = (1 << 6),
};
-/*
- * With each packet command, we allocate a buffer of IDE_PC_BUFFER_SIZE bytes.
- * This is used for several packet commands (not for READ/WRITE commands).
- */
-#define IDE_PC_BUFFER_SIZE 64
#define ATAPI_WAIT_PC (60 * HZ)
struct ide_atapi_pc {
@@ -347,12 +342,6 @@ struct ide_atapi_pc {
/* bytes to transfer */
int req_xfer;
- /* bytes actually transferred */
- int xferred;
-
- /* data buffer */
- u8 *buf;
- int buf_size;
/* the corresponding request */
struct request *rq;
@@ -363,8 +352,6 @@ struct ide_atapi_pc {
* those are more or less driver-specific and some of them are subject
* to change/removal later.
*/
- u8 pc_buf[IDE_PC_BUFFER_SIZE];
-
unsigned long timeout;
};
@@ -1130,6 +1117,8 @@ void SELECT_MASK(ide_drive_t *, int);
u8 ide_read_error(ide_drive_t *);
void ide_read_bcount_and_ireason(ide_drive_t *, u16 *, u8 *);
+int ide_check_ireason(ide_drive_t *, struct request *, int, int, int);
+
int ide_check_atapi_device(ide_drive_t *, const char *);
void ide_init_pc(struct ide_atapi_pc *);
@@ -1154,7 +1143,8 @@ enum {
REQ_IDETAPE_WRITE = (1 << 3),
};
-int ide_queue_pc_tail(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *);
+int ide_queue_pc_tail(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *,
+ void *, unsigned int);
int ide_do_test_unit_ready(ide_drive_t *, struct gendisk *);
int ide_do_start_stop(ide_drive_t *, struct gendisk *, int);