projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] PCI: Improve PCI config space writeback
[powerpc.git]
/
drivers
/
scsi
/
fd_mcs.c
diff --git
a/drivers/scsi/fd_mcs.c
b/drivers/scsi/fd_mcs.c
index
d59d449
..
cca485a
100644
(file)
--- a/
drivers/scsi/fd_mcs.c
+++ b/
drivers/scsi/fd_mcs.c
@@
-343,7
+343,7
@@
static void fd_mcs_make_bus_idle(struct Scsi_Host *shpnt)
outb(0x01 | PARITY_MASK, TMC_Cntl_port);
}
outb(0x01 | PARITY_MASK, TMC_Cntl_port);
}
-static int fd_mcs_detect(
Scsi_Host_T
emplate * tpnt)
+static int fd_mcs_detect(
struct scsi_host_t
emplate * tpnt)
{
int loop;
struct Scsi_Host *shpnt;
{
int loop;
struct Scsi_Host *shpnt;
@@
-671,7
+671,7
@@
static irqreturn_t fd_mcs_intr(int irq, void *dev_id, struct pt_regs *regs)
outb(0x40 | FIFO_COUNT, Interrupt_Cntl_port);
outb(0x82, SCSI_Cntl_port); /* Bus Enable + Select */
outb(0x40 | FIFO_COUNT, Interrupt_Cntl_port);
outb(0x82, SCSI_Cntl_port); /* Bus Enable + Select */
- outb(adapter_mask | (1 <<
current_SC->device->id
), SCSI_Data_NoACK_port);
+ outb(adapter_mask | (1 <<
scmd_id(current_SC)
), SCSI_Data_NoACK_port);
/* Stop arbitration and enable parity */
outb(0x10 | PARITY_MASK, TMC_Cntl_port);
/* Stop arbitration and enable parity */
outb(0x10 | PARITY_MASK, TMC_Cntl_port);
@@
-683,7
+683,7
@@
static irqreturn_t fd_mcs_intr(int irq, void *dev_id, struct pt_regs *regs)
status = inb(SCSI_Status_port);
if (!(status & 0x01)) {
/* Try again, for slow devices */
status = inb(SCSI_Status_port);
if (!(status & 0x01)) {
/* Try again, for slow devices */
- if (fd_mcs_select(shpnt,
current_SC->device->id
)) {
+ if (fd_mcs_select(shpnt,
scmd_id(current_SC)
)) {
#if EVERY_ACCESS
printk(" SFAIL ");
#endif
#if EVERY_ACCESS
printk(" SFAIL ");
#endif
@@
-1343,7
+1343,7
@@
static int fd_mcs_biosparam(struct scsi_device * disk, struct block_device *bdev
return 0;
}
return 0;
}
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_name = "fd_mcs",
.proc_info = fd_mcs_proc_info,
.detect = fd_mcs_detect,
.proc_name = "fd_mcs",
.proc_info = fd_mcs_proc_info,
.detect = fd_mcs_detect,