Commit 1c2a00ad authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[PATCH] remove IDE packet taskfile placeholders

This dead code was introduced in kernel 2.4.19 and hasn't been updated
since.
parent 9e74e3e1
...@@ -2208,28 +2208,3 @@ ide_startstop_t flagged_task_mulout_intr (ide_drive_t *drive) ...@@ -2208,28 +2208,3 @@ ide_startstop_t flagged_task_mulout_intr (ide_drive_t *drive)
return ide_started; return ide_started;
} }
/*
* Beginning of Taskfile OPCODE Library and feature sets.
*/
#ifdef CONFIG_PKT_TASK_IOCTL
int pkt_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
{
#if 0
switch(req_task->data_phase) {
case TASKFILE_P_OUT_DMAQ:
case TASKFILE_P_IN_DMAQ:
case TASKFILE_P_OUT_DMA:
case TASKFILE_P_IN_DMA:
case TASKFILE_P_OUT:
case TASKFILE_P_IN:
}
#endif
return -ENOMSG;
}
EXPORT_SYMBOL(pkt_taskfile_ioctl);
#endif /* CONFIG_PKT_TASK_IOCTL */
...@@ -1620,12 +1620,6 @@ int generic_ide_ioctl(struct block_device *bdev, unsigned int cmd, ...@@ -1620,12 +1620,6 @@ int generic_ide_ioctl(struct block_device *bdev, unsigned int cmd,
switch(drive->media) { switch(drive->media) {
case ide_disk: case ide_disk:
return ide_taskfile_ioctl(drive, cmd, arg); return ide_taskfile_ioctl(drive, cmd, arg);
#ifdef CONFIG_PKT_TASK_IOCTL
case ide_cdrom:
case ide_tape:
case ide_floppy:
return pkt_taskfile_ioctl(drive, cmd, arg);
#endif /* CONFIG_PKT_TASK_IOCTL */
default: default:
return -ENOMSG; return -ENOMSG;
} }
......
...@@ -1513,64 +1513,6 @@ int ide_taskfile_ioctl(ide_drive_t *, unsigned int, unsigned long); ...@@ -1513,64 +1513,6 @@ int ide_taskfile_ioctl(ide_drive_t *, unsigned int, unsigned long);
int ide_cmd_ioctl(ide_drive_t *, unsigned int, unsigned long); int ide_cmd_ioctl(ide_drive_t *, unsigned int, unsigned long);
int ide_task_ioctl(ide_drive_t *, unsigned int, unsigned long); int ide_task_ioctl(ide_drive_t *, unsigned int, unsigned long);
#if 0
#define IDEFLOPPY_PC_BUFFER_SIZE 256
#define IDETAPE_PC_BUFFER_SIZE 256
#define IDE_PC_BUFFER_SIZE 256
typedef struct ide_packet_command_s {
/* Actual packet bytes */
u8 c[12];
/* On each retry, we increment retries */
int retries;
/* Error code */
int error;
/* Bytes to transfer */
int request_transfer;
/* Bytes actually transferred */
int actually_transferred;
/* Size of our data buffer */
int buffer_size;
struct buffer_head *bh;
u8 *b_data;
/* The corresponding request */
struct request *rq;
# if 0
/* Scatter gather table */
struct scatterlist *sg;
# endif
int b_count;
/* Data buffer */
u8 *buffer;
/* Pointer into the above buffer */
u8 *current_position;
/* Called when this packet command is completed */
ide_startstop_t (*callback) (ide_drive_t *);
/* Temporary buffer */
u8 pc_buffer[IDE_PC_BUFFER_SIZE];
/* Status/Action bit flags: long for set_bit */
unsigned long flags;
} ide_pc_t;
ide-cd orthoginal :-/
struct packet_command {
char *buffer;
int buflen;
int stat;
int quiet;
int timeout;
struct request_sense *sense;
unsigned char c[12];
};
#endif
#ifdef CONFIG_PKT_TASK_IOCTL
extern int pkt_taskfile_ioctl(ide_drive_t *, struct inode *, struct file *, unsigned int, unsigned long);
#endif /* CONFIG_PKT_TASK_IOCTL */
extern void ide_delay_50ms(void); extern void ide_delay_50ms(void);
extern int system_bus_clock(void); extern int system_bus_clock(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment