Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[libata] Trim trailing whitespace.

Browse Source 
No code changes.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jeff Garzik 2007-02-26 05:51:33 -05:00
parent fb621e2fde
commit a84471fe26
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ata/libata-core.c
View File

@ -1719,7 +1719,7 @@ int ata_dev_configure(struct ata_device *dev)
"%s: %s, %s, max %s\n", "%s: %s, %s, max %s\n",
revbuf, modelbuf, fwrevbuf, revbuf, modelbuf, fwrevbuf,
ata_mode_string(xfer_mask)); ata_mode_string(xfer_mask));
ata_dev_printk(dev, KERN_INFO, ata_dev_printk(dev, KERN_INFO,
"%Lu sectors, multi %u, CHS %u/%u/%u\n", "%Lu sectors, multi %u, CHS %u/%u/%u\n",
(unsigned long long)dev->n_sectors, (unsigned long long)dev->n_sectors,
dev->multi_count, dev->cylinders, dev->multi_count, dev->cylinders,

6
drivers/ata/libata-sff.c
View File

@ -521,7 +521,7 @@ void ata_bmdma_post_internal_cmd(struct ata_queued_cmd *qc)
static int ata_resources_present(struct pci_dev *pdev, int port) static int ata_resources_present(struct pci_dev *pdev, int port)
{ {
int i; int i;
/* Check the PCI resources for this channel are enabled */ /* Check the PCI resources for this channel are enabled */
port = port * 2; port = port * 2;
for (i = 0; i < 2; i ++) { for (i = 0; i < 2; i ++) {
@ -531,7 +531,7 @@ static int ata_resources_present(struct pci_dev *pdev, int port)
} }
return 1; return 1;
} }
/** /**
* ata_pci_init_native_mode - Initialize native-mode driver * ata_pci_init_native_mode - Initialize native-mode driver
* @pdev: pci device to be initialized * @pdev: pci device to be initialized
@ -576,7 +576,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = IRQF_SHARED; probe_ent->irq_flags = IRQF_SHARED;
/* Discard disabled ports. Some controllers show their /* Discard disabled ports. Some controllers show their
unused channels this way */ unused channels this way */
if (ata_resources_present(pdev, 0) == 0) if (ata_resources_present(pdev, 0) == 0)

2
drivers/ata/pata_cs5520.c
View File

@ -348,7 +348,7 @@ static int cs5520_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
pci_save_state(pdev); pci_save_state(pdev);
return 0; return 0;
} }
/* For now keep DMA off. We can set it for all but A rev CS5510 once the /* For now keep DMA off. We can set it for all but A rev CS5510 once the
core ATA code can handle it */ core ATA code can handle it */

4
drivers/ata/pata_scc.c
View File

@ -233,7 +233,7 @@ static void scc_set_dmamode (struct ata_port *ap, struct ata_device *adev)
void __iomem *tdvhsel_port = ctrl_base + SCC_CTL_TDVHSEL; void __iomem *tdvhsel_port = ctrl_base + SCC_CTL_TDVHSEL;
int offset, idx; int offset, idx;
if (in_be32(cckctrl_port) & CCKCTRL_ATACLKOEN) if (in_be32(cckctrl_port) & CCKCTRL_ATACLKOEN)
offset = 1; /* 133MHz */ offset = 1; /* 133MHz */
else else
offset = 0; /* 100MHz */ offset = 0; /* 100MHz */
@ -720,7 +720,7 @@ static u8 scc_bmdma_status (struct ata_port *ap)
host_stat = in_be32(mmio + SCC_DMA_STATUS); host_stat = in_be32(mmio + SCC_DMA_STATUS);
/* Workaround for PTERADD: emulate DMA_INTR when /* Workaround for PTERADD: emulate DMA_INTR when
* - IDE_STATUS[ERR] = 1 * - IDE_STATUS[ERR] = 1
* - INT_STATUS[INTRQ] = 1 * - INT_STATUS[INTRQ] = 1
* - DMA_STATUS[IORACTA] = 1 * - DMA_STATUS[IORACTA] = 1

4
drivers/ata/pata_sil680.c
View File

@ -157,10 +157,10 @@ static void sil680_set_piomode(struct ata_port *ap, struct ata_device *adev)
pci_read_config_word(pdev, tfaddr-2, &reg); pci_read_config_word(pdev, tfaddr-2, &reg);
pci_read_config_byte(pdev, addr_mask, &mode); pci_read_config_byte(pdev, addr_mask, &mode);
reg &= ~0x0200; /* Clear IORDY */ reg &= ~0x0200; /* Clear IORDY */
mode &= ~(3 << port_shift); /* Clear IORDY and DMA bits */ mode &= ~(3 << port_shift); /* Clear IORDY and DMA bits */
if (ata_pio_need_iordy(adev)) { if (ata_pio_need_iordy(adev)) {
reg |= 0x0200; /* Enable IORDY */ reg |= 0x0200; /* Enable IORDY */
mode |= 1 << port_shift; mode |= 1 << port_shift;

2
drivers/ata/pata_via.c
View File

@ -170,7 +170,7 @@ static int via_pre_reset(struct ata_port *ap)
ap->cbl = ATA_CBL_PATA40; ap->cbl = ATA_CBL_PATA40;
else else
ap->cbl = ATA_CBL_PATA_UNK; ap->cbl = ATA_CBL_PATA_UNK;
return ata_std_prereset(ap); return ata_std_prereset(ap);
} }

8
drivers/ata/sata_nv.c
View File

@ -669,18 +669,18 @@ static unsigned int nv_adma_tf_to_cpb(struct ata_taskfile *tf, __le16 *cpb)
cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature); cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature);
} else } else
cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature | WNB); cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature | WNB);
cpb[idx++] = cpu_to_le16((ATA_REG_NSECT << 8) | tf->nsect); cpb[idx++] = cpu_to_le16((ATA_REG_NSECT << 8) | tf->nsect);
cpb[idx++] = cpu_to_le16((ATA_REG_LBAL << 8) | tf->lbal); cpb[idx++] = cpu_to_le16((ATA_REG_LBAL << 8) | tf->lbal);
cpb[idx++] = cpu_to_le16((ATA_REG_LBAM << 8) | tf->lbam); cpb[idx++] = cpu_to_le16((ATA_REG_LBAM << 8) | tf->lbam);
cpb[idx++] = cpu_to_le16((ATA_REG_LBAH << 8) | tf->lbah); cpb[idx++] = cpu_to_le16((ATA_REG_LBAH << 8) | tf->lbah);
} }
if(tf->flags & ATA_TFLAG_DEVICE) if(tf->flags & ATA_TFLAG_DEVICE)
cpb[idx++] = cpu_to_le16((ATA_REG_DEVICE << 8) | tf->device); cpb[idx++] = cpu_to_le16((ATA_REG_DEVICE << 8) | tf->device);
cpb[idx++] = cpu_to_le16((ATA_REG_CMD << 8) | tf->command | CMDEND); cpb[idx++] = cpu_to_le16((ATA_REG_CMD << 8) | tf->command | CMDEND);
while(idx < 12) while(idx < 12)
cpb[idx++] = cpu_to_le16(IGN); cpb[idx++] = cpu_to_le16(IGN);
@ -1402,7 +1402,7 @@ static void nv_adma_error_handler(struct ata_port *ap)
void __iomem *mmio = pp->ctl_block; void __iomem *mmio = pp->ctl_block;
int i; int i;
u16 tmp; u16 tmp;
if(ata_tag_valid(ap->active_tag) || ap->sactive) { if(ata_tag_valid(ap->active_tag) || ap->sactive) {
u32 notifier = readl(mmio + NV_ADMA_NOTIFIER); u32 notifier = readl(mmio + NV_ADMA_NOTIFIER);
u32 notifier_error = readl(mmio + NV_ADMA_NOTIFIER_ERROR); u32 notifier_error = readl(mmio + NV_ADMA_NOTIFIER_ERROR);

2
drivers/ata/sata_sis.c
View File

@ -309,7 +309,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
case 0x10: case 0x10:
ppi[1] = &sis_info133; ppi[1] = &sis_info133;
break; break;
case 0x30: case 0x30:
ppi[0] = &sis_info133; ppi[0] = &sis_info133;
break; break;

6
drivers/ata/sata_via.c
View File

@ -60,7 +60,7 @@ enum {
SATA_PATA_SHARING = 0x49, /* PATA/SATA sharing func ctrl */ SATA_PATA_SHARING = 0x49, /* PATA/SATA sharing func ctrl */
PATA_UDMA_TIMING = 0xB3, /* PATA timing for DMA/ cable detect */ PATA_UDMA_TIMING = 0xB3, /* PATA timing for DMA/ cable detect */
PATA_PIO_TIMING = 0xAB, /* PATA timing register */ PATA_PIO_TIMING = 0xAB, /* PATA timing register */
PORT0 = (1 << 1), PORT0 = (1 << 1),
PORT1 = (1 << 0), PORT1 = (1 << 0),
ALL_PORTS = PORT0 | PORT1, ALL_PORTS = PORT0 | PORT1,
@ -151,7 +151,7 @@ static const struct ata_port_operations vt6420_sata_ops = {
static const struct ata_port_operations vt6421_pata_ops = { static const struct ata_port_operations vt6421_pata_ops = {
.port_disable = ata_port_disable, .port_disable = ata_port_disable,
.set_piomode = vt6421_set_pio_mode, .set_piomode = vt6421_set_pio_mode,
.set_dmamode = vt6421_set_dma_mode, .set_dmamode = vt6421_set_dma_mode,
@ -185,7 +185,7 @@ static const struct ata_port_operations vt6421_pata_ops = {
static const struct ata_port_operations vt6421_sata_ops = { static const struct ata_port_operations vt6421_sata_ops = {
.port_disable = ata_port_disable, .port_disable = ata_port_disable,
.tf_load = ata_tf_load, .tf_load = ata_tf_load,
.tf_read = ata_tf_read, .tf_read = ata_tf_read,
.check_status = ata_check_status, .check_status = ata_check_status,