diff options
Diffstat (limited to 'drivers/scsi/sata_sil.c')
-rw-r--r-- | drivers/scsi/sata_sil.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c index 18c296c56899..c9333577330e 100644 --- a/drivers/scsi/sata_sil.c +++ b/drivers/scsi/sata_sil.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include <linux/libata.h> | 46 | #include <linux/libata.h> |
47 | 47 | ||
48 | #define DRV_NAME "sata_sil" | 48 | #define DRV_NAME "sata_sil" |
49 | #define DRV_VERSION "0.9" | 49 | #define DRV_VERSION "1.0" |
50 | 50 | ||
51 | enum { | 51 | enum { |
52 | /* | 52 | /* |
@@ -146,7 +146,6 @@ static struct scsi_host_template sil_sht = { | |||
146 | .name = DRV_NAME, | 146 | .name = DRV_NAME, |
147 | .ioctl = ata_scsi_ioctl, | 147 | .ioctl = ata_scsi_ioctl, |
148 | .queuecommand = ata_scsi_queuecmd, | 148 | .queuecommand = ata_scsi_queuecmd, |
149 | .eh_strategy_handler = ata_scsi_error, | ||
150 | .can_queue = ATA_DEF_QUEUE, | 149 | .can_queue = ATA_DEF_QUEUE, |
151 | .this_id = ATA_SHT_THIS_ID, | 150 | .this_id = ATA_SHT_THIS_ID, |
152 | .sg_tablesize = LIBATA_MAX_PRD, | 151 | .sg_tablesize = LIBATA_MAX_PRD, |
@@ -264,7 +263,7 @@ static void sil_post_set_mode (struct ata_port *ap) | |||
264 | 263 | ||
265 | for (i = 0; i < 2; i++) { | 264 | for (i = 0; i < 2; i++) { |
266 | dev = &ap->device[i]; | 265 | dev = &ap->device[i]; |
267 | if (!ata_dev_present(dev)) | 266 | if (!ata_dev_enabled(dev)) |
268 | dev_mode[i] = 0; /* PIO0/1/2 */ | 267 | dev_mode[i] = 0; /* PIO0/1/2 */ |
269 | else if (dev->flags & ATA_DFLAG_PIO) | 268 | else if (dev->flags & ATA_DFLAG_PIO) |
270 | dev_mode[i] = 1; /* PIO3/4 */ | 269 | dev_mode[i] = 1; /* PIO3/4 */ |
@@ -391,10 +390,6 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
391 | if (!printed_version++) | 390 | if (!printed_version++) |
392 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); | 391 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); |
393 | 392 | ||
394 | /* | ||
395 | * If this driver happens to only be useful on Apple's K2, then | ||
396 | * we should check that here as it has a normal Serverworks ID | ||
397 | */ | ||
398 | rc = pci_enable_device(pdev); | 393 | rc = pci_enable_device(pdev); |
399 | if (rc) | 394 | if (rc) |
400 | return rc; | 395 | return rc; |