mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[libata] export ata_dev_pair; trim trailing whitespace 

Mostly, trim trailing whitespace.

Also:
* export ata_dev_pair
* move ata_dev_classify export closer to ata_dev_pair export
This commit is contained in:
Jeff Garzik 2006-03-24 09:56:57 -05:00
parent ebdfca6eb1
commit 2e9edbf815
6 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/ata_piix.c
View File

@ -742,7 +742,7 @@ static int piix_disable_ahci(struct pci_dev *pdev)
/** /**
* piix_check_450nx_errata - Check for problem 450NX setup * piix_check_450nx_errata - Check for problem 450NX setup
* @ata_dev: the PCI device to check * @ata_dev: the PCI device to check
* *
* Check for the present of 450NX errata #19 and errata #25. If * Check for the present of 450NX errata #19 and errata #25. If
* they are found return an error code so we can turn off DMA * they are found return an error code so we can turn off DMA
*/ */
@ -753,7 +753,7 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev)
u16 cfg; u16 cfg;
u8 rev; u8 rev;
int no_piix_dma = 0; int no_piix_dma = 0;
while((pdev = pci_get_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454NX, pdev)) != NULL) while((pdev = pci_get_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454NX, pdev)) != NULL)
{ {
/* Look for 450NX PXB. Check for problem configurations /* Look for 450NX PXB. Check for problem configurations
@ -772,7 +772,7 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev)
if(no_piix_dma == 2) if(no_piix_dma == 2)
dev_printk(KERN_WARNING, &ata_dev->dev, "A BIOS update may resolve this.\n"); dev_printk(KERN_WARNING, &ata_dev->dev, "A BIOS update may resolve this.\n");
return no_piix_dma; return no_piix_dma;
} }
static void __devinit piix_init_sata_map(struct pci_dev *pdev, static void __devinit piix_init_sata_map(struct pci_dev *pdev,
struct ata_port_info *pinfo) struct ata_port_info *pinfo)

4
drivers/scsi/libata-bmdma.c
View File

@ -941,7 +941,7 @@ err_out:
* @pdev: PCI device * @pdev: PCI device
* *
* Some PCI ATA devices report simplex mode but in fact can be told to * Some PCI ATA devices report simplex mode but in fact can be told to
* enter non simplex mode. This implements the neccessary logic to * enter non simplex mode. This implements the neccessary logic to
* perform the task on such devices. Calling it on other devices will * perform the task on such devices. Calling it on other devices will
* have -undefined- behaviour. * have -undefined- behaviour.
*/ */
@ -966,7 +966,7 @@ unsigned long ata_pci_default_filter(const struct ata_port *ap, struct ata_devic
{ {
/* Filter out DMA modes if the device has been configured by /* Filter out DMA modes if the device has been configured by
the BIOS as PIO only */ the BIOS as PIO only */
if (ap->ioaddr.bmdma_addr == 0) if (ap->ioaddr.bmdma_addr == 0)
xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA); xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
return xfer_mask; return xfer_mask;

49
drivers/scsi/libata-core.c
View File

@ -190,7 +190,7 @@ static const u8 ata_rw_cmds[] = {
* ata_rwcmd_protocol - set taskfile r/w commands and protocol * ata_rwcmd_protocol - set taskfile r/w commands and protocol
* @qc: command to examine and configure * @qc: command to examine and configure
* *
* Examine the device configuration and tf->flags to calculate * Examine the device configuration and tf->flags to calculate
* the proper read/write commands and protocol to use. * the proper read/write commands and protocol to use.
* *
* LOCKING: * LOCKING:
@ -203,7 +203,7 @@ int ata_rwcmd_protocol(struct ata_queued_cmd *qc)
u8 cmd; u8 cmd;
int index, fua, lba48, write; int index, fua, lba48, write;
fua = (tf->flags & ATA_TFLAG_FUA) ? 4 : 0; fua = (tf->flags & ATA_TFLAG_FUA) ? 4 : 0;
lba48 = (tf->flags & ATA_TFLAG_LBA48) ? 2 : 0; lba48 = (tf->flags & ATA_TFLAG_LBA48) ? 2 : 0;
write = (tf->flags & ATA_TFLAG_WRITE) ? 1 : 0; write = (tf->flags & ATA_TFLAG_WRITE) ? 1 : 0;
@ -1055,7 +1055,7 @@ unsigned int ata_pio_need_iordy(const struct ata_device *adev)
return 0; return 0;
if (speed > 2) if (speed > 2)
return 1; return 1;
/* If we have no drive specific rule, then PIO 2 is non IORDY */ /* If we have no drive specific rule, then PIO 2 is non IORDY */
if (adev->id[ATA_ID_FIELD_VALID] & 2) { /* EIDE */ if (adev->id[ATA_ID_FIELD_VALID] & 2) { /* EIDE */
@ -1583,7 +1583,7 @@ void sata_phy_reset(struct ata_port *ap)
* Obtain the other device on the same cable, or if none is * Obtain the other device on the same cable, or if none is
* present NULL is returned * present NULL is returned
*/ */
struct ata_device *ata_dev_pair(struct ata_port *ap, struct ata_device *adev) struct ata_device *ata_dev_pair(struct ata_port *ap, struct ata_device *adev)
{ {
struct ata_device *pair = &ap->device[1 - adev->devno]; struct ata_device *pair = &ap->device[1 - adev->devno];
@ -1620,7 +1620,7 @@ void ata_port_disable(struct ata_port *ap)
* PIO 0-5, MWDMA 0-2 and UDMA 0-6 timings (in nanoseconds). * PIO 0-5, MWDMA 0-2 and UDMA 0-6 timings (in nanoseconds).
* These were taken from ATA/ATAPI-6 standard, rev 0a, except * These were taken from ATA/ATAPI-6 standard, rev 0a, except
* for PIO 5, which is a nonstandard extension and UDMA6, which * for PIO 5, which is a nonstandard extension and UDMA6, which
* is currently supported only by Maxtor drives. * is currently supported only by Maxtor drives.
*/ */
static const struct ata_timing ata_timing[] = { static const struct ata_timing ata_timing[] = {
@ -1635,11 +1635,11 @@ static const struct ata_timing ata_timing[] = {
{ XFER_UDMA_0, 0, 0, 0, 0, 0, 0, 0, 120 }, { XFER_UDMA_0, 0, 0, 0, 0, 0, 0, 0, 120 },
/* { XFER_UDMA_SLOW, 0, 0, 0, 0, 0, 0, 0, 150 }, */ /* { XFER_UDMA_SLOW, 0, 0, 0, 0, 0, 0, 0, 150 }, */
{ XFER_MW_DMA_2, 25, 0, 0, 0, 70, 25, 120, 0 }, { XFER_MW_DMA_2, 25, 0, 0, 0, 70, 25, 120, 0 },
{ XFER_MW_DMA_1, 45, 0, 0, 0, 80, 50, 150, 0 }, { XFER_MW_DMA_1, 45, 0, 0, 0, 80, 50, 150, 0 },
{ XFER_MW_DMA_0, 60, 0, 0, 0, 215, 215, 480, 0 }, { XFER_MW_DMA_0, 60, 0, 0, 0, 215, 215, 480, 0 },
{ XFER_SW_DMA_2, 60, 0, 0, 0, 120, 120, 240, 0 }, { XFER_SW_DMA_2, 60, 0, 0, 0, 120, 120, 240, 0 },
{ XFER_SW_DMA_1, 90, 0, 0, 0, 240, 240, 480, 0 }, { XFER_SW_DMA_1, 90, 0, 0, 0, 240, 240, 480, 0 },
{ XFER_SW_DMA_0, 120, 0, 0, 0, 480, 480, 960, 0 }, { XFER_SW_DMA_0, 120, 0, 0, 0, 480, 480, 960, 0 },
@ -1692,7 +1692,7 @@ static const struct ata_timing* ata_timing_find_mode(unsigned short speed)
for (t = ata_timing; t->mode != speed; t++) for (t = ata_timing; t->mode != speed; t++)
if (t->mode == 0xFF) if (t->mode == 0xFF)
return NULL; return NULL;
return t; return t;
} }
int ata_timing_compute(struct ata_device *adev, unsigned short speed, int ata_timing_compute(struct ata_device *adev, unsigned short speed,
@ -1702,7 +1702,7 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed,
struct ata_timing p; struct ata_timing p;
/* /*
* Find the mode. * Find the mode.
*/ */
if (!(s = ata_timing_find_mode(speed))) if (!(s = ata_timing_find_mode(speed)))
@ -2078,11 +2078,11 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,
*/ */
msleep(150); msleep(150);
/* Before we perform post reset processing we want to see if /* Before we perform post reset processing we want to see if
the bus shows 0xFF because the odd clown forgets the D7 pulldown the bus shows 0xFF because the odd clown forgets the D7 pulldown
resistor */ resistor */
if (ata_check_status(ap) == 0xFF) if (ata_check_status(ap) == 0xFF)
return 1; /* Positive is failure for some reason */ return 1; /* Positive is failure for some reason */
@ -2651,22 +2651,22 @@ static const char * const ata_dma_blacklist [] = {
"SanDisk SDP3B-64", NULL, "SanDisk SDP3B-64", NULL,
"SANYO CD-ROM CRD", NULL, "SANYO CD-ROM CRD", NULL,
"HITACHI CDR-8", NULL, "HITACHI CDR-8", NULL,
"HITACHI CDR-8335", NULL, "HITACHI CDR-8335", NULL,
"HITACHI CDR-8435", NULL, "HITACHI CDR-8435", NULL,
"Toshiba CD-ROM XM-6202B", NULL, "Toshiba CD-ROM XM-6202B", NULL,
"TOSHIBA CD-ROM XM-1702BC", NULL, "TOSHIBA CD-ROM XM-1702BC", NULL,
"CD-532E-A", NULL, "CD-532E-A", NULL,
"E-IDE CD-ROM CR-840", NULL, "E-IDE CD-ROM CR-840", NULL,
"CD-ROM Drive/F5A", NULL, "CD-ROM Drive/F5A", NULL,
"WPI CDD-820", NULL, "WPI CDD-820", NULL,
"SAMSUNG CD-ROM SC-148C", NULL, "SAMSUNG CD-ROM SC-148C", NULL,
"SAMSUNG CD-ROM SC", NULL, "SAMSUNG CD-ROM SC", NULL,
"SanDisk SDP3B-64", NULL, "SanDisk SDP3B-64", NULL,
"ATAPI CD-ROM DRIVE 40X MAXIMUM",NULL, "ATAPI CD-ROM DRIVE 40X MAXIMUM",NULL,
"_NEC DV5800A", NULL, "_NEC DV5800A", NULL,
"SAMSUNG CD-ROM SN-124", "N001" "SAMSUNG CD-ROM SN-124", "N001"
}; };
static int ata_strim(char *s, size_t len) static int ata_strim(char *s, size_t len)
{ {
len = strnlen(s, len); len = strnlen(s, len);
@ -3697,7 +3697,7 @@ static void ata_pio_error(struct ata_port *ap)
if (qc->tf.command != ATA_CMD_PACKET) if (qc->tf.command != ATA_CMD_PACKET)
printk(KERN_WARNING "ata%u: PIO error\n", ap->id); printk(KERN_WARNING "ata%u: PIO error\n", ap->id);
/* make sure qc->err_mask is available to /* make sure qc->err_mask is available to
* know what's wrong and recover * know what's wrong and recover
*/ */
WARN_ON(qc->err_mask == 0); WARN_ON(qc->err_mask == 0);
@ -4695,7 +4695,7 @@ err_free_ret:
* ata_host_set_remove - PCI layer callback for device removal * ata_host_set_remove - PCI layer callback for device removal
* @host_set: ATA host set that was removed * @host_set: ATA host set that was removed
* *
* Unregister all objects associated with this host set. Free those * Unregister all objects associated with this host set. Free those
* objects. * objects.
* *
* LOCKING: * LOCKING:
@ -4967,6 +4967,8 @@ EXPORT_SYMBOL_GPL(ata_std_postreset);
EXPORT_SYMBOL_GPL(ata_std_probe_reset); EXPORT_SYMBOL_GPL(ata_std_probe_reset);
EXPORT_SYMBOL_GPL(ata_drive_probe_reset); EXPORT_SYMBOL_GPL(ata_drive_probe_reset);
EXPORT_SYMBOL_GPL(ata_dev_revalidate); EXPORT_SYMBOL_GPL(ata_dev_revalidate);
EXPORT_SYMBOL_GPL(ata_dev_classify);
EXPORT_SYMBOL_GPL(ata_dev_pair);
EXPORT_SYMBOL_GPL(ata_port_disable); EXPORT_SYMBOL_GPL(ata_port_disable);
EXPORT_SYMBOL_GPL(ata_ratelimit); EXPORT_SYMBOL_GPL(ata_ratelimit);
EXPORT_SYMBOL_GPL(ata_busy_sleep); EXPORT_SYMBOL_GPL(ata_busy_sleep);
@ -4977,7 +4979,6 @@ EXPORT_SYMBOL_GPL(ata_scsi_error);
EXPORT_SYMBOL_GPL(ata_scsi_slave_config); EXPORT_SYMBOL_GPL(ata_scsi_slave_config);
EXPORT_SYMBOL_GPL(ata_scsi_release); EXPORT_SYMBOL_GPL(ata_scsi_release);
EXPORT_SYMBOL_GPL(ata_host_intr); EXPORT_SYMBOL_GPL(ata_host_intr);
EXPORT_SYMBOL_GPL(ata_dev_classify);
EXPORT_SYMBOL_GPL(ata_id_string); EXPORT_SYMBOL_GPL(ata_id_string);
EXPORT_SYMBOL_GPL(ata_id_c_string); EXPORT_SYMBOL_GPL(ata_id_c_string);
EXPORT_SYMBOL_GPL(ata_scsi_simulate); EXPORT_SYMBOL_GPL(ata_scsi_simulate);

30
drivers/scsi/libata-scsi.c
View File

@ -256,7 +256,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg)
scsi_cmd[14] = args[0]; scsi_cmd[14] = args[0];
/* Good values for timeout and retries? Values below /* Good values for timeout and retries? Values below
from scsi_ioctl_send_command() for default case... */ from scsi_ioctl_send_command() for default case... */
if (scsi_execute_req(scsidev, scsi_cmd, DMA_NONE, NULL, 0, &sshdr, if (scsi_execute_req(scsidev, scsi_cmd, DMA_NONE, NULL, 0, &sshdr,
(10*HZ), 5)) (10*HZ), 5))
rc = -EIO; rc = -EIO;
@ -438,7 +438,7 @@ int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)
* LOCKING: * LOCKING:
* spin_lock_irqsave(host_set lock) * spin_lock_irqsave(host_set lock)
*/ */
void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc, void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,
u8 *ascq) u8 *ascq)
{ {
int i; int i;
@ -495,7 +495,7 @@ void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,
/* Look for drv_err */ /* Look for drv_err */
for (i = 0; sense_table[i][0] != 0xFF; i++) { for (i = 0; sense_table[i][0] != 0xFF; i++) {
/* Look for best matches first */ /* Look for best matches first */
if ((sense_table[i][0] & drv_err) == if ((sense_table[i][0] & drv_err) ==
sense_table[i][0]) { sense_table[i][0]) {
*sk = sense_table[i][1]; *sk = sense_table[i][1];
*asc = sense_table[i][2]; *asc = sense_table[i][2];
@ -518,7 +518,7 @@ void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,
} }
} }
/* No error? Undecoded? */ /* No error? Undecoded? */
printk(KERN_WARNING "ata%u: no sense translation for status: 0x%02x\n", printk(KERN_WARNING "ata%u: no sense translation for status: 0x%02x\n",
id, drv_stat); id, drv_stat);
/* We need a sensible error return here, which is tricky, and one /* We need a sensible error return here, which is tricky, and one
@ -1150,14 +1150,14 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc, const u8 *sc
DPRINTK("block %u track %u cyl %u head %u sect %u\n", DPRINTK("block %u track %u cyl %u head %u sect %u\n",
(u32)block, track, cyl, head, sect); (u32)block, track, cyl, head, sect);
/* Check whether the converted CHS can fit. /* Check whether the converted CHS can fit.
Cylinder: 0-65535 Cylinder: 0-65535
Head: 0-15 Head: 0-15
Sector: 1-255*/ Sector: 1-255*/
if ((cyl >> 16) || (head >> 4) || (sect >> 8) || (!sect)) if ((cyl >> 16) || (head >> 4) || (sect >> 8) || (!sect))
goto out_of_range; goto out_of_range;
tf->command = ATA_CMD_VERIFY; tf->command = ATA_CMD_VERIFY;
tf->nsect = n_block & 0xff; /* Sector count 0 means 256 sectors */ tf->nsect = n_block & 0xff; /* Sector count 0 means 256 sectors */
tf->lbal = sect; tf->lbal = sect;
@ -1289,7 +1289,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm
tf->lbal = block & 0xff; tf->lbal = block & 0xff;
tf->device |= ATA_LBA; tf->device |= ATA_LBA;
} else { } else {
/* CHS */ /* CHS */
u32 sect, head, cyl, track; u32 sect, head, cyl, track;
@ -1309,8 +1309,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm
DPRINTK("block %u track %u cyl %u head %u sect %u\n", DPRINTK("block %u track %u cyl %u head %u sect %u\n",
(u32)block, track, cyl, head, sect); (u32)block, track, cyl, head, sect);
/* Check whether the converted CHS can fit. /* Check whether the converted CHS can fit.
Cylinder: 0-65535 Cylinder: 0-65535
Head: 0-15 Head: 0-15
Sector: 1-255*/ Sector: 1-255*/
if ((cyl >> 16) || (head >> 4) || (sect >> 8) || (!sect)) if ((cyl >> 16) || (head >> 4) || (sect >> 8) || (!sect))
@ -1697,7 +1697,7 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,
if (buflen > (ATA_SERNO_LEN + num + 3)) { if (buflen > (ATA_SERNO_LEN + num + 3)) {
/* piv=0, assoc=lu, code_set=ACSII, designator=vendor */ /* piv=0, assoc=lu, code_set=ACSII, designator=vendor */
rbuf[num + 0] = 2; rbuf[num + 0] = 2;
rbuf[num + 3] = ATA_SERNO_LEN; rbuf[num + 3] = ATA_SERNO_LEN;
num += 4; num += 4;
ata_id_string(args->id, (unsigned char *) rbuf + num, ata_id_string(args->id, (unsigned char *) rbuf + num,
@ -1707,8 +1707,8 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,
if (buflen > (sat_model_serial_desc_len + num + 3)) { if (buflen > (sat_model_serial_desc_len + num + 3)) {
/* SAT defined lu model and serial numbers descriptor */ /* SAT defined lu model and serial numbers descriptor */
/* piv=0, assoc=lu, code_set=ACSII, designator=t10 vendor id */ /* piv=0, assoc=lu, code_set=ACSII, designator=t10 vendor id */
rbuf[num + 0] = 2; rbuf[num + 0] = 2;
rbuf[num + 1] = 1; rbuf[num + 1] = 1;
rbuf[num + 3] = sat_model_serial_desc_len; rbuf[num + 3] = sat_model_serial_desc_len;
num += 4; num += 4;
memcpy(rbuf + num, "ATA ", 8); memcpy(rbuf + num, "ATA ", 8);

2
drivers/scsi/sata_sil24.c
View File

@ -342,7 +342,7 @@ static struct ata_port_info sil24_port_info[] = {
.udma_mask = 0x3f, /* udma0-5 */ .udma_mask = 0x3f, /* udma0-5 */
.port_ops = &sil24_ops, .port_ops = &sil24_ops,
}, },
/* sil_3132 */ /* sil_3132 */
{ {
.sht = &sil24_sht, .sht = &sil24_sht,
.host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

4
drivers/scsi/sata_vsc.c
View File

@ -230,11 +230,11 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance,
handled += ata_host_intr(ap, qc); handled += ata_host_intr(ap, qc);
} else if (is_vsc_sata_int_err(i, int_status)) { } else if (is_vsc_sata_int_err(i, int_status)) {
/* /*
* On some chips (i.e. Intel 31244), an error * On some chips (i.e. Intel 31244), an error
* interrupt will sneak in at initialization * interrupt will sneak in at initialization
* time (phy state changes). Clearing the SCR * time (phy state changes). Clearing the SCR
* error register is not required, but it prevents * error register is not required, but it prevents
* the phy state change interrupts from recurring * the phy state change interrupts from recurring
* later. * later.
*/ */
u32 err_status; u32 err_status;