[SCSI] remove Scsi_Pointer typedef
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Родитель
d0be4a7d29
Коммит
0a04137e75
|
@ -896,7 +896,7 @@ void acornscsi_done(AS_Host *host, Scsi_Cmnd **SCpntp, unsigned int result)
|
||||||
* Notes : this will only be one SG entry or less
|
* Notes : this will only be one SG entry or less
|
||||||
*/
|
*/
|
||||||
static
|
static
|
||||||
void acornscsi_data_updateptr(AS_Host *host, Scsi_Pointer *SCp, unsigned int length)
|
void acornscsi_data_updateptr(AS_Host *host, struct scsi_pointer *SCp, unsigned int length)
|
||||||
{
|
{
|
||||||
SCp->ptr += length;
|
SCp->ptr += length;
|
||||||
SCp->this_residual -= length;
|
SCp->this_residual -= length;
|
||||||
|
|
|
@ -292,7 +292,7 @@ typedef struct acornscsi_hostdata {
|
||||||
unsigned char tag; /* reconnected tag */
|
unsigned char tag; /* reconnected tag */
|
||||||
} reconnected;
|
} reconnected;
|
||||||
|
|
||||||
Scsi_Pointer SCp; /* current commands data pointer */
|
struct scsi_pointer SCp; /* current commands data pointer */
|
||||||
|
|
||||||
MsgQueue_t msgs;
|
MsgQueue_t msgs;
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ struct arxescsi_info {
|
||||||
* Returns : 0 if we should not set CMD_WITHDMA for transfer info command
|
* Returns : 0 if we should not set CMD_WITHDMA for transfer info command
|
||||||
*/
|
*/
|
||||||
static fasdmatype_t
|
static fasdmatype_t
|
||||||
arxescsi_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
arxescsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
|
||||||
fasdmadir_t direction, fasdmatype_t min_type)
|
fasdmadir_t direction, fasdmatype_t min_type)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -111,7 +111,7 @@ static void arxescsi_pseudo_dma_write(unsigned char *addr, void __iomem *base)
|
||||||
* transfer - minimum number of bytes we expect to transfer
|
* transfer - minimum number of bytes we expect to transfer
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
arxescsi_dma_pseudo(struct Scsi_Host *host, struct scsi_pointer *SCp,
|
||||||
fasdmadir_t direction, int transfer)
|
fasdmadir_t direction, int transfer)
|
||||||
{
|
{
|
||||||
struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata;
|
struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata;
|
||||||
|
@ -197,7 +197,7 @@ arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
||||||
* Params : host - host
|
* Params : host - host
|
||||||
* SCpnt - command
|
* SCpnt - command
|
||||||
*/
|
*/
|
||||||
static void arxescsi_dma_stop(struct Scsi_Host *host, Scsi_Pointer *SCp)
|
static void arxescsi_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* no DMA to stop
|
* no DMA to stop
|
||||||
|
|
|
@ -157,7 +157,7 @@ cumanascsi_2_intr(int irq, void *dev_id, struct pt_regs *regs)
|
||||||
* Returns : type of transfer to be performed
|
* Returns : type of transfer to be performed
|
||||||
*/
|
*/
|
||||||
static fasdmatype_t
|
static fasdmatype_t
|
||||||
cumanascsi_2_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
cumanascsi_2_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
|
||||||
fasdmadir_t direction, fasdmatype_t min_type)
|
fasdmadir_t direction, fasdmatype_t min_type)
|
||||||
{
|
{
|
||||||
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
|
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
|
||||||
|
@ -209,7 +209,7 @@ cumanascsi_2_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
||||||
* transfer - minimum number of bytes we expect to transfer
|
* transfer - minimum number of bytes we expect to transfer
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
cumanascsi_2_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
cumanascsi_2_dma_pseudo(struct Scsi_Host *host, struct scsi_pointer *SCp,
|
||||||
fasdmadir_t direction, int transfer)
|
fasdmadir_t direction, int transfer)
|
||||||
{
|
{
|
||||||
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
|
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
|
||||||
|
@ -283,7 +283,7 @@ cumanascsi_2_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
||||||
* SCpnt - command
|
* SCpnt - command
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
cumanascsi_2_dma_stop(struct Scsi_Host *host, Scsi_Pointer *SCp)
|
cumanascsi_2_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
|
||||||
{
|
{
|
||||||
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
|
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
|
||||||
if (info->info.scsi.dma != NO_DMA) {
|
if (info->info.scsi.dma != NO_DMA) {
|
||||||
|
|
|
@ -158,7 +158,7 @@ eesoxscsi_intr(int irq, void *dev_id, struct pt_regs *regs)
|
||||||
* Returns : type of transfer to be performed
|
* Returns : type of transfer to be performed
|
||||||
*/
|
*/
|
||||||
static fasdmatype_t
|
static fasdmatype_t
|
||||||
eesoxscsi_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
eesoxscsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
|
||||||
fasdmadir_t direction, fasdmatype_t min_type)
|
fasdmadir_t direction, fasdmatype_t min_type)
|
||||||
{
|
{
|
||||||
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
|
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
|
||||||
|
@ -353,7 +353,7 @@ static void eesoxscsi_buffer_out(void *buf, int length, void __iomem *base)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eesoxscsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
eesoxscsi_dma_pseudo(struct Scsi_Host *host, struct scsi_pointer *SCp,
|
||||||
fasdmadir_t dir, int transfer_size)
|
fasdmadir_t dir, int transfer_size)
|
||||||
{
|
{
|
||||||
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
|
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
|
||||||
|
@ -370,7 +370,7 @@ eesoxscsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
||||||
* SCpnt - command
|
* SCpnt - command
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
eesoxscsi_dma_stop(struct Scsi_Host *host, Scsi_Pointer *SCp)
|
eesoxscsi_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
|
||||||
{
|
{
|
||||||
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
|
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
|
||||||
if (info->info.scsi.dma != NO_DMA)
|
if (info->info.scsi.dma != NO_DMA)
|
||||||
|
|
|
@ -173,7 +173,7 @@ static void fas216_dumpstate(FAS216_Info *info)
|
||||||
fas216_readb(info, REG_CTCH));
|
fas216_readb(info, REG_CTCH));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_SCp(Scsi_Pointer *SCp, const char *prefix, const char *suffix)
|
static void print_SCp(struct scsi_pointer *SCp, const char *prefix, const char *suffix)
|
||||||
{
|
{
|
||||||
printk("%sptr %p this_residual 0x%x buffer %p buffers_residual 0x%x%s",
|
printk("%sptr %p this_residual 0x%x buffer %p buffers_residual 0x%x%s",
|
||||||
prefix, SCp->ptr, SCp->this_residual, SCp->buffer,
|
prefix, SCp->ptr, SCp->this_residual, SCp->buffer,
|
||||||
|
@ -628,7 +628,7 @@ static void fas216_handlesync(FAS216_Info *info, char *msg)
|
||||||
*/
|
*/
|
||||||
static void fas216_updateptrs(FAS216_Info *info, int bytes_transferred)
|
static void fas216_updateptrs(FAS216_Info *info, int bytes_transferred)
|
||||||
{
|
{
|
||||||
Scsi_Pointer *SCp = &info->scsi.SCp;
|
struct scsi_pointer *SCp = &info->scsi.SCp;
|
||||||
|
|
||||||
fas216_checkmagic(info);
|
fas216_checkmagic(info);
|
||||||
|
|
||||||
|
@ -668,7 +668,7 @@ static void fas216_updateptrs(FAS216_Info *info, int bytes_transferred)
|
||||||
*/
|
*/
|
||||||
static void fas216_pio(FAS216_Info *info, fasdmadir_t direction)
|
static void fas216_pio(FAS216_Info *info, fasdmadir_t direction)
|
||||||
{
|
{
|
||||||
Scsi_Pointer *SCp = &info->scsi.SCp;
|
struct scsi_pointer *SCp = &info->scsi.SCp;
|
||||||
|
|
||||||
fas216_checkmagic(info);
|
fas216_checkmagic(info);
|
||||||
|
|
||||||
|
|
|
@ -243,7 +243,7 @@ typedef struct {
|
||||||
unsigned int irq; /* interrupt */
|
unsigned int irq; /* interrupt */
|
||||||
int dma; /* dma channel */
|
int dma; /* dma channel */
|
||||||
|
|
||||||
Scsi_Pointer SCp; /* current commands data pointer */
|
struct scsi_pointer SCp; /* current commands data pointer */
|
||||||
|
|
||||||
MsgQueue_t msgs; /* message queue for connected device */
|
MsgQueue_t msgs; /* message queue for connected device */
|
||||||
|
|
||||||
|
@ -304,9 +304,9 @@ typedef struct {
|
||||||
/* dma */
|
/* dma */
|
||||||
struct {
|
struct {
|
||||||
fasdmatype_t transfer_type; /* current type of DMA transfer */
|
fasdmatype_t transfer_type; /* current type of DMA transfer */
|
||||||
fasdmatype_t (*setup) (struct Scsi_Host *host, Scsi_Pointer *SCp, fasdmadir_t direction, fasdmatype_t min_dma);
|
fasdmatype_t (*setup) (struct Scsi_Host *host, struct scsi_pointer *SCp, fasdmadir_t direction, fasdmatype_t min_dma);
|
||||||
void (*pseudo)(struct Scsi_Host *host, Scsi_Pointer *SCp, fasdmadir_t direction, int transfer);
|
void (*pseudo)(struct Scsi_Host *host, struct scsi_pointer *SCp, fasdmadir_t direction, int transfer);
|
||||||
void (*stop) (struct Scsi_Host *host, Scsi_Pointer *SCp);
|
void (*stop) (struct Scsi_Host *host, struct scsi_pointer *SCp);
|
||||||
} dma;
|
} dma;
|
||||||
|
|
||||||
/* miscellaneous */
|
/* miscellaneous */
|
||||||
|
|
|
@ -132,7 +132,7 @@ powertecscsi_intr(int irq, void *dev_id, struct pt_regs *regs)
|
||||||
* Returns : type of transfer to be performed
|
* Returns : type of transfer to be performed
|
||||||
*/
|
*/
|
||||||
static fasdmatype_t
|
static fasdmatype_t
|
||||||
powertecscsi_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
powertecscsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
|
||||||
fasdmadir_t direction, fasdmatype_t min_type)
|
fasdmadir_t direction, fasdmatype_t min_type)
|
||||||
{
|
{
|
||||||
struct powertec_info *info = (struct powertec_info *)host->hostdata;
|
struct powertec_info *info = (struct powertec_info *)host->hostdata;
|
||||||
|
@ -174,7 +174,7 @@ powertecscsi_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
|
||||||
* SCpnt - command
|
* SCpnt - command
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
powertecscsi_dma_stop(struct Scsi_Host *host, Scsi_Pointer *SCp)
|
powertecscsi_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
|
||||||
{
|
{
|
||||||
struct powertec_info *info = (struct powertec_info *)host->hostdata;
|
struct powertec_info *info = (struct powertec_info *)host->hostdata;
|
||||||
if (info->info.scsi.dma != NO_DMA)
|
if (info->info.scsi.dma != NO_DMA)
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
* The scatter-gather list handling. This contains all
|
* The scatter-gather list handling. This contains all
|
||||||
* the yucky stuff that needs to be fixed properly.
|
* the yucky stuff that needs to be fixed properly.
|
||||||
*/
|
*/
|
||||||
static inline int copy_SCp_to_sg(struct scatterlist *sg, Scsi_Pointer *SCp, int max)
|
static inline int copy_SCp_to_sg(struct scatterlist *sg, struct scsi_pointer *SCp, int max)
|
||||||
{
|
{
|
||||||
int bufs = SCp->buffers_residual;
|
int bufs = SCp->buffers_residual;
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ static inline int copy_SCp_to_sg(struct scatterlist *sg, Scsi_Pointer *SCp, int
|
||||||
return bufs + 1;
|
return bufs + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int next_SCp(Scsi_Pointer *SCp)
|
static inline int next_SCp(struct scsi_pointer *SCp)
|
||||||
{
|
{
|
||||||
int ret = SCp->buffers_residual;
|
int ret = SCp->buffers_residual;
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
@ -49,7 +49,7 @@ static inline int next_SCp(Scsi_Pointer *SCp)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline unsigned char get_next_SCp_byte(Scsi_Pointer *SCp)
|
static inline unsigned char get_next_SCp_byte(struct scsi_pointer *SCp)
|
||||||
{
|
{
|
||||||
char c = *SCp->ptr;
|
char c = *SCp->ptr;
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ static inline unsigned char get_next_SCp_byte(Scsi_Pointer *SCp)
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void put_next_SCp_byte(Scsi_Pointer *SCp, unsigned char c)
|
static inline void put_next_SCp_byte(struct scsi_pointer *SCp, unsigned char c)
|
||||||
{
|
{
|
||||||
*SCp->ptr = c;
|
*SCp->ptr = c;
|
||||||
SCp->ptr += 1;
|
SCp->ptr += 1;
|
||||||
|
|
|
@ -1686,7 +1686,7 @@ mega_rundoneq (adapter_t *adapter)
|
||||||
|
|
||||||
list_for_each(pos, &adapter->completed_list) {
|
list_for_each(pos, &adapter->completed_list) {
|
||||||
|
|
||||||
Scsi_Pointer* spos = (Scsi_Pointer *)pos;
|
struct scsi_pointer* spos = (struct scsi_pointer *)pos;
|
||||||
|
|
||||||
cmd = list_entry(spos, Scsi_Cmnd, SCp);
|
cmd = list_entry(spos, Scsi_Cmnd, SCp);
|
||||||
cmd->scsi_done(cmd);
|
cmd->scsi_done(cmd);
|
||||||
|
|
|
@ -2,4 +2,3 @@
|
||||||
typedef struct scsi_device Scsi_Device;
|
typedef struct scsi_device Scsi_Device;
|
||||||
typedef struct scsi_cmnd Scsi_Cmnd;
|
typedef struct scsi_cmnd Scsi_Cmnd;
|
||||||
typedef struct scsi_request Scsi_Request;
|
typedef struct scsi_request Scsi_Request;
|
||||||
typedef struct scsi_pointer Scsi_Pointer;
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче