forked from luck/tmp_suning_uos_patched
libata: checkpatch fixes
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
49f2909039
commit
11b7becca9
|
@ -4374,11 +4374,11 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev)
|
|||
tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE | ATA_TFLAG_POLLING;
|
||||
tf.protocol = ATA_PROT_NODATA;
|
||||
/* If we are using IORDY we must send the mode setting command */
|
||||
if (ata_pio_need_iordy(dev))
|
||||
tf.nsect = dev->xfer_mode;
|
||||
if (ata_pio_need_iordy(dev))
|
||||
tf.nsect = dev->xfer_mode;
|
||||
/* If the device has IORDY and the controller does not - turn it off */
|
||||
else if (ata_id_has_iordy(dev->id))
|
||||
tf.nsect = 0x01;
|
||||
tf.nsect = 0x01;
|
||||
else /* In the ancient relic department - skip all of this */
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ static int ali_cable_override(struct pci_dev *pdev)
|
|||
if (pdev->subsystem_vendor == 0x10CF && pdev->subsystem_device == 0x10AF)
|
||||
return 1;
|
||||
/* Mitac 8317 (Winbook-A) and relatives */
|
||||
if (pdev->subsystem_vendor == 0x1071 && pdev->subsystem_device == 0x8317)
|
||||
if (pdev->subsystem_vendor == 0x1071 && pdev->subsystem_device == 0x8317)
|
||||
return 1;
|
||||
/* Systems by DMI */
|
||||
if (dmi_check_system(cable_dmi_table))
|
||||
|
|
|
@ -61,7 +61,8 @@ static void ninja32_set_piomode(struct ata_port *ap, struct ata_device *adev)
|
|||
static u16 pio_timing[5] = {
|
||||
0xd6, 0x85, 0x44, 0x33, 0x13
|
||||
};
|
||||
iowrite8(pio_timing[adev->pio_mode - XFER_PIO_0], ap->ioaddr.bmdma_addr + 0x1f);
|
||||
iowrite8(pio_timing[adev->pio_mode - XFER_PIO_0],
|
||||
ap->ioaddr.bmdma_addr + 0x1f);
|
||||
ap->private_data = adev;
|
||||
}
|
||||
|
||||
|
@ -176,12 +177,13 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
|
|||
iowrite8(0xB3, base + 0x02); /* Burst, ?? setup */
|
||||
iowrite8(0x00, base + 0x04); /* WAIT0 ? */
|
||||
/* FIXME: Should we disable them at remove ? */
|
||||
return ata_host_activate(host, dev->irq, ata_interrupt, IRQF_SHARED, &ninja32_sht);
|
||||
return ata_host_activate(host, dev->irq, ata_interrupt,
|
||||
IRQF_SHARED, &ninja32_sht);
|
||||
}
|
||||
|
||||
static const struct pci_device_id ninja32[] = {
|
||||
{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
|
||||
{ 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
|
||||
{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||
{ 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||
{ },
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user