diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/ata | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/ata_piix.c | 2 | ||||
-rw-r--r-- | drivers/ata/libata-sff.c | 6 | ||||
-rw-r--r-- | drivers/ata/pata_cs5535.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_fsl.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 9ac4e378992e..3aadded05a05 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -599,7 +599,7 @@ static const struct ich_laptop ich_laptop[] = { | |||
599 | { 0x27DF, 0x1028, 0x02b0 }, /* ICH7 on unknown Dell */ | 599 | { 0x27DF, 0x1028, 0x02b0 }, /* ICH7 on unknown Dell */ |
600 | { 0x27DF, 0x1043, 0x1267 }, /* ICH7 on Asus W5F */ | 600 | { 0x27DF, 0x1043, 0x1267 }, /* ICH7 on Asus W5F */ |
601 | { 0x27DF, 0x103C, 0x30A1 }, /* ICH7 on HP Compaq nc2400 */ | 601 | { 0x27DF, 0x103C, 0x30A1 }, /* ICH7 on HP Compaq nc2400 */ |
602 | { 0x27DF, 0x103C, 0x361a }, /* ICH7 on unkown HP */ | 602 | { 0x27DF, 0x103C, 0x361a }, /* ICH7 on unknown HP */ |
603 | { 0x27DF, 0x1071, 0xD221 }, /* ICH7 on Hercules EC-900 */ | 603 | { 0x27DF, 0x1071, 0xD221 }, /* ICH7 on Hercules EC-900 */ |
604 | { 0x27DF, 0x152D, 0x0778 }, /* ICH7 on unknown Intel */ | 604 | { 0x27DF, 0x152D, 0x0778 }, /* ICH7 on unknown Intel */ |
605 | { 0x24CA, 0x1025, 0x0061 }, /* ICH4 on ACER Aspire 2023WLMi */ | 605 | { 0x24CA, 0x1025, 0x0061 }, /* ICH4 on ACER Aspire 2023WLMi */ |
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index bbbb1fab1755..d210ef2d5608 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -736,7 +736,7 @@ unsigned int ata_sff_data_xfer(struct ata_device *dev, unsigned char *buf, | |||
736 | 736 | ||
737 | /* | 737 | /* |
738 | * Use io*16_rep() accessors here as well to avoid pointlessly | 738 | * Use io*16_rep() accessors here as well to avoid pointlessly |
739 | * swapping bytes to and fro on the big endian machines... | 739 | * swapping bytes to and from on the big endian machines... |
740 | */ | 740 | */ |
741 | if (rw == READ) { | 741 | if (rw == READ) { |
742 | ioread16_rep(data_addr, pad, 1); | 742 | ioread16_rep(data_addr, pad, 1); |
@@ -776,7 +776,7 @@ unsigned int ata_sff_data_xfer32(struct ata_device *dev, unsigned char *buf, | |||
776 | void __iomem *data_addr = ap->ioaddr.data_addr; | 776 | void __iomem *data_addr = ap->ioaddr.data_addr; |
777 | unsigned int words = buflen >> 2; | 777 | unsigned int words = buflen >> 2; |
778 | int slop = buflen & 3; | 778 | int slop = buflen & 3; |
779 | 779 | ||
780 | if (!(ap->pflags & ATA_PFLAG_PIO32)) | 780 | if (!(ap->pflags & ATA_PFLAG_PIO32)) |
781 | return ata_sff_data_xfer(dev, buf, buflen, rw); | 781 | return ata_sff_data_xfer(dev, buf, buflen, rw); |
782 | 782 | ||
@@ -795,7 +795,7 @@ unsigned int ata_sff_data_xfer32(struct ata_device *dev, unsigned char *buf, | |||
795 | 795 | ||
796 | /* | 796 | /* |
797 | * Use io*_rep() accessors here as well to avoid pointlessly | 797 | * Use io*_rep() accessors here as well to avoid pointlessly |
798 | * swapping bytes to and fro on the big endian machines... | 798 | * swapping bytes to and from on the big endian machines... |
799 | */ | 799 | */ |
800 | if (rw == READ) { | 800 | if (rw == READ) { |
801 | if (slop < 3) | 801 | if (slop < 3) |
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c index 403f56165cec..71cef9a962d4 100644 --- a/drivers/ata/pata_cs5535.c +++ b/drivers/ata/pata_cs5535.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Alan Cox <alan@lxorguk.ukuu.org.uk> | 4 | * Alan Cox <alan@lxorguk.ukuu.org.uk> |
5 | * | 5 | * |
6 | * based upon cs5535.c from AMD <Jens.Altmann@amd.com> as cleaned up and | 6 | * based upon cs5535.c from AMD <Jens.Altmann@amd.com> as cleaned up and |
7 | * made readable and Linux style by Wolfgang Zuleger <wolfgang.zuleger@gmx.de | 7 | * made readable and Linux style by Wolfgang Zuleger <wolfgang.zuleger@gmx.de> |
8 | * and Alexander Kiausch <alex.kiausch@t-online.de> | 8 | * and Alexander Kiausch <alex.kiausch@t-online.de> |
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 172b57e6543f..e295f86b3f70 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c | |||
@@ -43,9 +43,9 @@ enum { | |||
43 | /* | 43 | /* |
44 | * SATA-FSL host controller supports a max. of (15+1) direct PRDEs, and | 44 | * SATA-FSL host controller supports a max. of (15+1) direct PRDEs, and |
45 | * chained indirect PRDEs upto a max count of 63. | 45 | * chained indirect PRDEs upto a max count of 63. |
46 | * We are allocating an array of 63 PRDEs contigiously, but PRDE#15 will | 46 | * We are allocating an array of 63 PRDEs contiguously, but PRDE#15 will |
47 | * be setup as an indirect descriptor, pointing to it's next | 47 | * be setup as an indirect descriptor, pointing to it's next |
48 | * (contigious) PRDE. Though chained indirect PRDE arrays are | 48 | * (contiguous) PRDE. Though chained indirect PRDE arrays are |
49 | * supported,it will be more efficient to use a direct PRDT and | 49 | * supported,it will be more efficient to use a direct PRDT and |
50 | * a single chain/link to indirect PRDE array/PRDT. | 50 | * a single chain/link to indirect PRDE array/PRDT. |
51 | */ | 51 | */ |
@@ -314,7 +314,7 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc, | |||
314 | u32 ttl_dwords = 0; | 314 | u32 ttl_dwords = 0; |
315 | 315 | ||
316 | /* | 316 | /* |
317 | * NOTE : direct & indirect prdt's are contigiously allocated | 317 | * NOTE : direct & indirect prdt's are contiguously allocated |
318 | */ | 318 | */ |
319 | struct prde *prd = (struct prde *)&((struct command_desc *) | 319 | struct prde *prd = (struct prde *)&((struct command_desc *) |
320 | cmd_desc)->prdt; | 320 | cmd_desc)->prdt; |