Skip to content

L
linux
Commit 01d08aa9 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files
Options

[PATCH] avoid obsolete APIs in ide-scsi 

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent fcba8b41
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 10 deletions
drivers/scsi/ide-scsi.c
View file @ 01d08aa9
...@@ -50,8 +50,11 @@ ...@@ -50,8 +50,11 @@
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "scsi.h" #include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include <scsi/scsi_tcq.h>
#include <scsi/sg.h> #include <scsi/sg.h>
#define IDESCSI_DEBUG_LOG 0 #define IDESCSI_DEBUG_LOG 0
...@@ -66,8 +69,8 @@ typedef struct idescsi_pc_s { ...@@ -66,8 +69,8 @@ typedef struct idescsi_pc_s {
u8 *current_position; /* Pointer into the above buffer */ u8 *current_position; /* Pointer into the above buffer */
struct scatterlist *sg; /* Scatter gather table */ struct scatterlist *sg; /* Scatter gather table */
int b_count; /* Bytes transferred from current entry */ int b_count; /* Bytes transferred from current entry */
Scsi_Cmnd *scsi_cmd; /* SCSI command */ struct scsi_cmnd *scsi_cmd; /* SCSI command */
void (*done)(Scsi_Cmnd *); /* Scsi completion routine */ void (*done)(struct scsi_cmnd *); /* Scsi completion routine */
unsigned long flags; /* Status/Action flags */ unsigned long flags; /* Status/Action flags */
unsigned long timeout; /* Command timeout */ unsigned long timeout; /* Command timeout */
} idescsi_pc_t; } idescsi_pc_t;
...@@ -747,7 +750,7 @@ static struct block_device_operations idescsi_ops = { ...@@ -747,7 +750,7 @@ static struct block_device_operations idescsi_ops = {
static int idescsi_attach(ide_drive_t *drive); static int idescsi_attach(ide_drive_t *drive);
static int idescsi_slave_configure(Scsi_Device * sdp) static int idescsi_slave_configure(struct scsi_device * sdp)
{ {
/* Configure detected device */ /* Configure detected device */
scsi_adjust_queue_depth(sdp, MSG_SIMPLE_TAG, sdp->host->cmd_per_lun); scsi_adjust_queue_depth(sdp, MSG_SIMPLE_TAG, sdp->host->cmd_per_lun);
...@@ -759,7 +762,7 @@ static const char *idescsi_info (struct Scsi_Host *host) ...@@ -759,7 +762,7 @@ static const char *idescsi_info (struct Scsi_Host *host)
return "SCSI host adapter emulation for IDE ATAPI devices"; return "SCSI host adapter emulation for IDE ATAPI devices";
} }
static int idescsi_ioctl (Scsi_Device *dev, int cmd, void __user *arg) static int idescsi_ioctl (struct scsi_device *dev, int cmd, void __user *arg)
{ {
idescsi_scsi_t *scsi = scsihost_to_idescsi(dev->host); idescsi_scsi_t *scsi = scsihost_to_idescsi(dev->host);
...@@ -849,7 +852,7 @@ static inline struct bio *idescsi_dma_bio(ide_drive_t *drive, idescsi_pc_t *pc) ...@@ -849,7 +852,7 @@ static inline struct bio *idescsi_dma_bio(ide_drive_t *drive, idescsi_pc_t *pc)
return first_bh; return first_bh;
} }
static inline int should_transform(ide_drive_t *drive, Scsi_Cmnd *cmd) static inline int should_transform(ide_drive_t *drive, struct scsi_cmnd *cmd)
{ {
idescsi_scsi_t *scsi = drive_to_idescsi(drive); idescsi_scsi_t *scsi = drive_to_idescsi(drive);
...@@ -867,7 +870,8 @@ static inline int should_transform(ide_drive_t *drive, Scsi_Cmnd *cmd) ...@@ -867,7 +870,8 @@ static inline int should_transform(ide_drive_t *drive, Scsi_Cmnd *cmd)
return test_bit(IDESCSI_TRANSFORM, &scsi->transform); return test_bit(IDESCSI_TRANSFORM, &scsi->transform);
} }
static int idescsi_queue (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *)) static int idescsi_queue (struct scsi_cmnd *cmd,
void (*done)(struct scsi_cmnd *))
{ {
struct Scsi_Host *host = cmd->device->host; struct Scsi_Host *host = cmd->device->host;
idescsi_scsi_t *scsi = scsihost_to_idescsi(host); idescsi_scsi_t *scsi = scsihost_to_idescsi(host);
...@@ -933,7 +937,7 @@ static int idescsi_queue (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *)) ...@@ -933,7 +937,7 @@ static int idescsi_queue (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
return 1; return 1;
} }
static int idescsi_eh_abort (Scsi_Cmnd *cmd) static int idescsi_eh_abort (struct scsi_cmnd *cmd)
{ {
idescsi_scsi_t *scsi = scsihost_to_idescsi(cmd->device->host); idescsi_scsi_t *scsi = scsihost_to_idescsi(cmd->device->host);
ide_drive_t *drive = scsi->drive; ide_drive_t *drive = scsi->drive;
...@@ -992,7 +996,7 @@ static int idescsi_eh_abort (Scsi_Cmnd *cmd) ...@@ -992,7 +996,7 @@ static int idescsi_eh_abort (Scsi_Cmnd *cmd)
return ret; return ret;
} }
static int idescsi_eh_reset (Scsi_Cmnd *cmd) static int idescsi_eh_reset (struct scsi_cmnd *cmd)
{ {
struct request *req; struct request *req;
idescsi_scsi_t *scsi = scsihost_to_idescsi(cmd->device->host); idescsi_scsi_t *scsi = scsihost_to_idescsi(cmd->device->host);
...@@ -1075,7 +1079,7 @@ static int idescsi_bios(struct scsi_device *sdev, struct block_device *bdev, ...@@ -1075,7 +1079,7 @@ static int idescsi_bios(struct scsi_device *sdev, struct block_device *bdev,
return 0; return 0;
} }
static Scsi_Host_Template idescsi_template = { static struct scsi_host_template idescsi_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "idescsi", .name = "idescsi",
.info = idescsi_info, .info = idescsi_info,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7