Skip to content

L
linux
Commit 8042ffff authored by Andrew Morton's avatar Andrew Morton Committed by Jens Axboe
Browse files
Options

[PATCH] fix compile breakage on drivers/scsi/NCR53C9x.c 

Patch from John Kim <john@larvalstage.com>

This fixes compile breakage due to recent changes to scsi.h
parent 7807a1bc
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
drivers/scsi/NCR53C9x.c
View file @ 8042ffff
......@@ -356,7 +356,7 @@ static inline Scsi_Cmnd *remove_SC(Scsi_Cmnd **SC, int target, int lun)
Scsi_Cmnd *ptr, *prev;
for(ptr = *SC, prev = NULL;
ptr && ((ptr->target != target) || (ptr->lun != lun));
ptr && ((ptr->device->id != target) || (ptr->device->lun != lun));
prev = ptr, ptr = (Scsi_Cmnd *) ptr->host_scribble)
;
if(ptr) {
......@@ -946,7 +946,7 @@ static void esp_release_dmabufs(struct NCR_ESP *esp, Scsi_Cmnd *sp)
static void esp_restore_pointers(struct NCR_ESP *esp, Scsi_Cmnd *sp)
{
struct esp_pointers *ep = &esp->data_pointers[sp->target];
struct esp_pointers *ep = &esp->data_pointers[sp->device->id];
sp->SCp.ptr = ep->saved_ptr;
sp->SCp.buffer = ep->saved_buffer;
......@@ -956,7 +956,7 @@ static void esp_restore_pointers(struct NCR_ESP *esp, Scsi_Cmnd *sp)
static void esp_save_pointers(struct NCR_ESP *esp, Scsi_Cmnd *sp)
{
struct esp_pointers *ep = &esp->data_pointers[sp->target];
struct esp_pointers *ep = &esp->data_pointers[sp->device->id];
ep->saved_ptr = sp->SCp.ptr;
ep->saved_buffer = sp->SCp.buffer;
......@@ -1037,8 +1037,8 @@ static void esp_exec_cmd(struct NCR_ESP *esp)
SDptr = SCptr->device;
esp_dev = SDptr->hostdata;
lun = SCptr->lun;
target = SCptr->target;
lun = SCptr->device->lun;
target = SCptr->device->id;
esp->snip = 0;
esp->msgout_len = 0;
......@@ -1249,7 +1249,7 @@ int esp_queue(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
SCpnt->scsi_done = done;
SCpnt->SCp.phase = not_issued;
esp = (struct NCR_ESP *) SCpnt->host->hostdata;
esp = (struct NCR_ESP *) SCpnt->device->host->hostdata;
if(esp->dma_led_on)
esp->dma_led_on(esp);
......@@ -1285,7 +1285,7 @@ int esp_queue(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
int esp_command(Scsi_Cmnd *SCpnt)
{
#ifdef DEBUG_ESP
struct NCR_ESP *esp = (struct NCR_ESP *) SCpnt->host->hostdata;
struct NCR_ESP *esp = (struct NCR_ESP *) SCpnt->device->host->hostdata;
#endif
ESPLOG(("esp%d: esp_command() called...\n", esp->esp_id));
......@@ -1297,7 +1297,7 @@ static void esp_dump_cmd(Scsi_Cmnd *SCptr)
{
ESPLOG(("[tgt<%02x> lun<%02x> "
"pphase<%s> cphase<%s>]",
SCptr->target, SCptr->lun,
SCptr->device->id, SCptr->device->lun,
phase_string(SCptr->SCp.sent_command),
phase_string(SCptr->SCp.phase)));
}
......@@ -1358,7 +1358,7 @@ static void esp_dump_state(struct NCR_ESP *esp,
/* Abort a command. The host_lock is acquired by caller. */
int esp_abort(Scsi_Cmnd *SCptr)
{
struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->host->hostdata;
struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->device->host->hostdata;
struct ESP_regs *eregs = esp->eregs;
int don;
......@@ -1486,7 +1486,7 @@ static int esp_do_resetbus(struct NCR_ESP *esp,
*/
int esp_reset(Scsi_Cmnd *SCptr)
{
struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->host->hostdata;
struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->device->host->hostdata;
(void) esp_do_resetbus(esp, esp->eregs);
......@@ -1716,13 +1716,13 @@ static inline void esp_connect(struct NCR_ESP *esp, struct ESP_regs *eregs,
if(esp->prev_soff != esp_dev->sync_max_offset ||
esp->prev_stp != esp_dev->sync_min_period ||
(esp->erev > esp100a &&
esp->prev_cfg3 != esp->config3[sp->target])) {
esp->prev_cfg3 != esp->config3[sp->device->id])) {
esp->prev_soff = esp_dev->sync_max_offset;
esp_write(eregs->esp_soff, esp->prev_soff);
esp->prev_stp = esp_dev->sync_min_period;
esp_write(eregs->esp_stp, esp->prev_stp);
if(esp->erev > esp100a) {
esp->prev_cfg3 = esp->config3[sp->target];
esp->prev_cfg3 = esp->config3[sp->device->id];
esp_write(eregs->esp_cfg3, esp->prev_cfg3);
}
}
......@@ -2117,7 +2117,7 @@ static int esp_do_data_finale(struct NCR_ESP *esp,
esp->esp_id,
SCptr->use_sg, SCptr->SCp.ptr, SCptr->SCp.this_residual));
ESPLOG(("esp%d: Forcing async for target %d\n", esp->esp_id,
SCptr->target));
SCptr->device->id));
SCptr->device->borken = 1;
esp_dev->sync = 0;
bytes_sent = 0;
......@@ -2225,7 +2225,7 @@ static int esp_do_freebus(struct NCR_ESP *esp, struct ESP_regs *eregs)
if(SCptr->SCp.Status != GOOD &&
SCptr->SCp.Status != CONDITION_GOOD &&
((1<<SCptr->target) & esp->targets_present) &&
((1<<SCptr->device->id) & esp->targets_present) &&
esp_dev->sync && esp_dev->sync_max_offset) {
/* SCSI standard says that the synchronous capabilities
* should be renegotiated at this point. Most likely
......@@ -2283,21 +2283,21 @@ static int esp_bad_reconnect(struct NCR_ESP *esp)
sp = esp->issue_SC;
ESPLOG(("esp%d: issue_SC[", esp->esp_id));
while(sp) {
ESPLOG(("<%02x,%02x>", sp->target, sp->lun));
ESPLOG(("<%02x,%02x>", sp->device->id, sp->device->lun));
sp = (Scsi_Cmnd *) sp->host_scribble;
}
ESPLOG(("]\n"));
sp = esp->current_SC;
ESPLOG(("esp%d: current_SC[", esp->esp_id));
while(sp) {
ESPLOG(("<%02x,%02x>", sp->target, sp->lun));
ESPLOG(("<%02x,%02x>", sp->device->id, sp->device->lun));
sp = (Scsi_Cmnd *) sp->host_scribble;
}
ESPLOG(("]\n"));
sp = esp->disconnected_SC;
ESPLOG(("esp%d: disconnected_SC[", esp->esp_id));
while(sp) {
ESPLOG(("<%02x,%02x>", sp->target, sp->lun));
ESPLOG(("<%02x,%02x>", sp->device->id, sp->device->lun));
sp = (Scsi_Cmnd *) sp->host_scribble;
}
ESPLOG(("]\n"));
......@@ -2617,7 +2617,7 @@ static int esp_select_complete(struct NCR_ESP *esp, struct ESP_regs *eregs)
*/
if(esp->ireg == (ESP_INTR_FDONE | ESP_INTR_BSERV)) {
/* target speaks... */
esp->targets_present |= (1<<SCptr->target);
esp->targets_present |= (1<<SCptr->device->id);
/* What if the target ignores the sdtr? */
if(esp->snip)
......@@ -2646,7 +2646,7 @@ static int esp_select_complete(struct NCR_ESP *esp, struct ESP_regs *eregs)
* XXX for synchronous transfers.
*/
ESPLOG(("esp%d: STEP_ASEL for tgt %d\n",
esp->esp_id, SCptr->target));
esp->esp_id, SCptr->device->id));
case ESP_STEP_SID:
/* Arbitration won, target selected, went
......@@ -2763,14 +2763,14 @@ static int esp_select_complete(struct NCR_ESP *esp, struct ESP_regs *eregs)
if(esp->disconnected_SC)
esp_cmd(esp, eregs, ESP_CMD_ESEL);
if(((1<<SCptr->target) & esp->targets_present) &&
if(((1<<SCptr->device->id) & esp->targets_present) &&
esp->seqreg && esp->cur_msgout[0] == EXTENDED_MESSAGE &&
(SCptr->SCp.phase == in_slct_msg ||
SCptr->SCp.phase == in_slct_stop)) {
/* shit */
esp->snip = 0;
ESPLOG(("esp%d: Failed synchronous negotiation for target %d "
"lun %d\n", esp->esp_id, SCptr->target, SCptr->lun));
"lun %d\n", esp->esp_id, SCptr->device->id, SCptr->device->lun));
esp_dev->sync_max_offset = 0;
esp_dev->sync_min_period = 0;
esp_dev->sync = 1; /* so we don't negotiate again */
......@@ -2796,9 +2796,9 @@ static int esp_select_complete(struct NCR_ESP *esp, struct ESP_regs *eregs)
* or whenever when we are scanning the bus for targets.
* But first make sure that is really what is happening.
*/
if(((1<<SCptr->target) & esp->targets_present)) {
if(((1<<SCptr->device->id) & esp->targets_present)) {
ESPLOG(("esp%d: Warning, live target %d not responding to "
"selection.\n", esp->esp_id, SCptr->target));
"selection.\n", esp->esp_id, SCptr->device->id));
/* This _CAN_ happen. The SCSI standard states that
* the target is to _not_ respond to selection if
......@@ -2892,7 +2892,7 @@ static int check_singlebyte_msg(struct NCR_ESP *esp,
case NOP:
ESPLOG(("esp%d: target %d sends a nop\n", esp->esp_id,
esp->current_SC->target));
esp->current_SC->device->id));
return 0;
case RESTORE_POINTERS:
......@@ -2985,7 +2985,7 @@ static void sync_report(struct NCR_ESP *esp)
* sibling call optimization. -DaveM
*/
ESPLOG((KERN_INFO "esp%d: target %d ",
esp->esp_id, esp->current_SC->target));
esp->esp_id, esp->current_SC->device->id));
ESPLOG(("[period %dns offset %d %d.%02dMHz ",
(int) msg3 * 4, (int) msg4,
integer, fraction));
......@@ -2993,7 +2993,7 @@ static void sync_report(struct NCR_ESP *esp)
(((msg3 * 4) < 200) ? "-II" : "")));
} else {
ESPLOG((KERN_INFO "esp%d: target %d asynchronous\n",
esp->esp_id, esp->current_SC->target));
esp->esp_id, esp->current_SC->device->id));
}
}
......@@ -3070,10 +3070,10 @@ static int check_multibyte_msg(struct NCR_ESP *esp,
else
bit = ESP_CONFIG3_FSCSI;
if(period < 50)
esp->config3[SCptr->target] |= bit;
esp->config3[SCptr->device->id] |= bit;
else
esp->config3[SCptr->target] &= ~bit;
esp->prev_cfg3 = esp->config3[SCptr->target];
esp->config3[SCptr->device->id] &= ~bit;
esp->prev_cfg3 = esp->config3[SCptr->device->id];
esp_write(eregs->esp_cfg3, esp->prev_cfg3);
}
esp->prev_soff = esp_dev->sync_min_period;
......@@ -3103,8 +3103,8 @@ static int check_multibyte_msg(struct NCR_ESP *esp,
bit = ESP_CONFIG3_FAST;
else
bit = ESP_CONFIG3_FSCSI;
esp->config3[SCptr->target] &= ~bit;
esp->prev_cfg3 = esp->config3[SCptr->target];
esp->config3[SCptr->device->id] &= ~bit;
esp->prev_cfg3 = esp->config3[SCptr->device->id];
esp_write(eregs->esp_cfg3, esp->prev_cfg3);
}
}
......@@ -3493,7 +3493,7 @@ void esp_handle(struct NCR_ESP *esp)
* a nexus is alive on the bus.
*/
ESPLOG(("esp%d: Forcing async and disabling disconnect for "
"target %d\n", esp->esp_id, SCptr->target));
"target %d\n", esp->esp_id, SCptr->device->id));
SCptr->device->borken = 1; /* foo on you */
}
......
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