diff options
-rw-r--r-- | drivers/ata/Kconfig | 2 | ||||
-rw-r--r-- | drivers/ata/libata-core.c | 8 | ||||
-rw-r--r-- | drivers/ata/libata-eh.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_artop.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_cmd640.c | 4 | ||||
-rw-r--r-- | drivers/ata/pata_hpt37x.c | 10 | ||||
-rw-r--r-- | drivers/ata/sata_nv.c | 4 | ||||
-rw-r--r-- | drivers/ata/sata_sil.c | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index ad1f59c1b3fc..b4a8d6030e48 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -132,7 +132,7 @@ config SATA_SIS | |||
132 | depends on PCI | 132 | depends on PCI |
133 | select PATA_SIS | 133 | select PATA_SIS |
134 | help | 134 | help |
135 | This option enables support for SiS Serial ATA on | 135 | This option enables support for SiS Serial ATA on |
136 | SiS 964/965/966/180 and Parallel ATA on SiS 180. | 136 | SiS 964/965/966/180 and Parallel ATA on SiS 180. |
137 | The PATA support for SiS 180 requires additionally to | 137 | The PATA support for SiS 180 requires additionally to |
138 | enable the PATA_SIS driver in the config. | 138 | enable the PATA_SIS driver in the config. |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index c809619d23ce..94f339e34f1a 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -977,7 +977,7 @@ static u64 ata_hpa_resize(struct ata_device *dev) | |||
977 | { | 977 | { |
978 | u64 sectors = dev->n_sectors; | 978 | u64 sectors = dev->n_sectors; |
979 | u64 hpa_sectors; | 979 | u64 hpa_sectors; |
980 | 980 | ||
981 | if (ata_id_has_lba48(dev->id)) | 981 | if (ata_id_has_lba48(dev->id)) |
982 | hpa_sectors = ata_read_native_max_address_ext(dev); | 982 | hpa_sectors = ata_read_native_max_address_ext(dev); |
983 | else | 983 | else |
@@ -1588,7 +1588,7 @@ unsigned int ata_do_simple_cmd(struct ata_device *dev, u8 cmd) | |||
1588 | * Check if the current speed of the device requires IORDY. Used | 1588 | * Check if the current speed of the device requires IORDY. Used |
1589 | * by various controllers for chip configuration. | 1589 | * by various controllers for chip configuration. |
1590 | */ | 1590 | */ |
1591 | 1591 | ||
1592 | unsigned int ata_pio_need_iordy(const struct ata_device *adev) | 1592 | unsigned int ata_pio_need_iordy(const struct ata_device *adev) |
1593 | { | 1593 | { |
1594 | /* Controller doesn't support IORDY. Probably a pointless check | 1594 | /* Controller doesn't support IORDY. Probably a pointless check |
@@ -1611,7 +1611,7 @@ unsigned int ata_pio_need_iordy(const struct ata_device *adev) | |||
1611 | * Compute the highest mode possible if we are not using iordy. Return | 1611 | * Compute the highest mode possible if we are not using iordy. Return |
1612 | * -1 if no iordy mode is available. | 1612 | * -1 if no iordy mode is available. |
1613 | */ | 1613 | */ |
1614 | 1614 | ||
1615 | static u32 ata_pio_mask_no_iordy(const struct ata_device *adev) | 1615 | static u32 ata_pio_mask_no_iordy(const struct ata_device *adev) |
1616 | { | 1616 | { |
1617 | /* If we have no drive specific rule, then PIO 2 is non IORDY */ | 1617 | /* If we have no drive specific rule, then PIO 2 is non IORDY */ |
@@ -2663,7 +2663,7 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed, | |||
2663 | t->active += (t->cycle - (t->active + t->recover)) / 2; | 2663 | t->active += (t->cycle - (t->active + t->recover)) / 2; |
2664 | t->recover = t->cycle - t->active; | 2664 | t->recover = t->cycle - t->active; |
2665 | } | 2665 | } |
2666 | 2666 | ||
2667 | /* In a few cases quantisation may produce enough errors to | 2667 | /* In a few cases quantisation may produce enough errors to |
2668 | leave t->cycle too low for the sum of active and recovery | 2668 | leave t->cycle too low for the sum of active and recovery |
2669 | if so we must correct this */ | 2669 | if so we must correct this */ |
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 5309c312f517..d8070989a39f 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
@@ -1009,7 +1009,7 @@ static unsigned int atapi_eh_request_sense(struct ata_queued_cmd *qc) | |||
1009 | sense_buf[0] = 0x70; | 1009 | sense_buf[0] = 0x70; |
1010 | sense_buf[2] = qc->result_tf.feature >> 4; | 1010 | sense_buf[2] = qc->result_tf.feature >> 4; |
1011 | 1011 | ||
1012 | /* some devices time out if garbage left in tf */ | 1012 | /* some devices time out if garbage left in tf */ |
1013 | ata_tf_init(dev, &tf); | 1013 | ata_tf_init(dev, &tf); |
1014 | 1014 | ||
1015 | memset(cdb, 0, ATAPI_CDB_LEN); | 1015 | memset(cdb, 0, ATAPI_CDB_LEN); |
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c index 9861059dd673..c60e7a04a715 100644 --- a/drivers/ata/pata_artop.c +++ b/drivers/ata/pata_artop.c | |||
@@ -99,7 +99,7 @@ static int artop6260_pre_reset(struct ata_port *ap, unsigned long deadline) | |||
99 | * | 99 | * |
100 | * Identify the cable type for the ARTOp interface in question | 100 | * Identify the cable type for the ARTOp interface in question |
101 | */ | 101 | */ |
102 | 102 | ||
103 | static int artop6260_cable_detect(struct ata_port *ap) | 103 | static int artop6260_cable_detect(struct ata_port *ap) |
104 | { | 104 | { |
105 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 105 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c index ed00fa9d53be..31cbf8daa299 100644 --- a/drivers/ata/pata_cmd640.c +++ b/drivers/ata/pata_cmd640.c | |||
@@ -107,7 +107,7 @@ static void cmd640_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
107 | pci_write_config_byte(pdev, arttim + 1, (t.active << 4) | t.recover); | 107 | pci_write_config_byte(pdev, arttim + 1, (t.active << 4) | t.recover); |
108 | } else { | 108 | } else { |
109 | /* Save the shared timings for channel, they will be loaded | 109 | /* Save the shared timings for channel, they will be loaded |
110 | by qc_issue_prot. Reloading the setup time is expensive | 110 | by qc_issue_prot. Reloading the setup time is expensive |
111 | so we keep a merged one loaded */ | 111 | so we keep a merged one loaded */ |
112 | pci_read_config_byte(pdev, ARTIM23, ®); | 112 | pci_read_config_byte(pdev, ARTIM23, ®); |
113 | reg &= 0x3F; | 113 | reg &= 0x3F; |
@@ -231,7 +231,7 @@ static void cmd640_hardware_init(struct pci_dev *pdev) | |||
231 | pci_write_config_byte(pdev, CMDTIM, 0); | 231 | pci_write_config_byte(pdev, CMDTIM, 0); |
232 | /* 512 byte bursts (sector) */ | 232 | /* 512 byte bursts (sector) */ |
233 | pci_write_config_byte(pdev, BRST, 0x40); | 233 | pci_write_config_byte(pdev, BRST, 0x40); |
234 | /* | 234 | /* |
235 | * A reporter a long time ago | 235 | * A reporter a long time ago |
236 | * Had problems with the data fifo | 236 | * Had problems with the data fifo |
237 | * So don't run the risk | 237 | * So don't run the risk |
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c index 5a0a410654e2..a54c17433eef 100644 --- a/drivers/ata/pata_hpt37x.c +++ b/drivers/ata/pata_hpt37x.c | |||
@@ -961,7 +961,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
961 | u8 mcr1; | 961 | u8 mcr1; |
962 | u32 freq; | 962 | u32 freq; |
963 | int prefer_dpll = 1; | 963 | int prefer_dpll = 1; |
964 | 964 | ||
965 | unsigned long iobase = pci_resource_start(dev, 4); | 965 | unsigned long iobase = pci_resource_start(dev, 4); |
966 | 966 | ||
967 | const struct hpt_chip *chip_table; | 967 | const struct hpt_chip *chip_table; |
@@ -1055,7 +1055,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
1055 | */ | 1055 | */ |
1056 | 1056 | ||
1057 | pci_write_config_byte(dev, 0x5b, 0x23); | 1057 | pci_write_config_byte(dev, 0x5b, 0x23); |
1058 | 1058 | ||
1059 | /* | 1059 | /* |
1060 | * HighPoint does this for HPT372A. | 1060 | * HighPoint does this for HPT372A. |
1061 | * NOTE: This register is only writeable via I/O space. | 1061 | * NOTE: This register is only writeable via I/O space. |
@@ -1088,7 +1088,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
1088 | * Turn the frequency check into a band and then find a timing | 1088 | * Turn the frequency check into a band and then find a timing |
1089 | * table to match it. | 1089 | * table to match it. |
1090 | */ | 1090 | */ |
1091 | 1091 | ||
1092 | clock_slot = hpt37x_clock_slot(freq, chip_table->base); | 1092 | clock_slot = hpt37x_clock_slot(freq, chip_table->base); |
1093 | if (chip_table->clocks[clock_slot] == NULL || prefer_dpll) { | 1093 | if (chip_table->clocks[clock_slot] == NULL || prefer_dpll) { |
1094 | /* | 1094 | /* |
@@ -1099,11 +1099,11 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
1099 | */ | 1099 | */ |
1100 | unsigned int f_low, f_high; | 1100 | unsigned int f_low, f_high; |
1101 | int adjust; | 1101 | int adjust; |
1102 | 1102 | ||
1103 | clock_slot = 2; | 1103 | clock_slot = 2; |
1104 | if (port->udma_mask & 0xE0) | 1104 | if (port->udma_mask & 0xE0) |
1105 | clock_slot = 3; | 1105 | clock_slot = 3; |
1106 | 1106 | ||
1107 | f_low = (MHz[clock_slot] * chip_table->base) / 192; | 1107 | f_low = (MHz[clock_slot] * chip_table->base) / 192; |
1108 | f_high = f_low + 2; | 1108 | f_high = f_low + 2; |
1109 | 1109 | ||
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 1a49c777fa6a..885357b8c939 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -802,7 +802,7 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance) | |||
802 | u16 status; | 802 | u16 status; |
803 | u32 gen_ctl; | 803 | u32 gen_ctl; |
804 | u32 notifier, notifier_error; | 804 | u32 notifier, notifier_error; |
805 | 805 | ||
806 | /* if ADMA is disabled, use standard ata interrupt handler */ | 806 | /* if ADMA is disabled, use standard ata interrupt handler */ |
807 | if (pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) { | 807 | if (pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) { |
808 | u8 irq_stat = readb(host->iomap[NV_MMIO_BAR] + NV_INT_STATUS_CK804) | 808 | u8 irq_stat = readb(host->iomap[NV_MMIO_BAR] + NV_INT_STATUS_CK804) |
@@ -963,7 +963,7 @@ static void nv_adma_irq_clear(struct ata_port *ap) | |||
963 | 963 | ||
964 | /* clear ADMA status */ | 964 | /* clear ADMA status */ |
965 | writew(0xffff, mmio + NV_ADMA_STAT); | 965 | writew(0xffff, mmio + NV_ADMA_STAT); |
966 | 966 | ||
967 | /* clear notifiers - note both ports need to be written with | 967 | /* clear notifiers - note both ports need to be written with |
968 | something even though we are only clearing on one */ | 968 | something even though we are only clearing on one */ |
969 | if (ap->port_no == 0) { | 969 | if (ap->port_no == 0) { |
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index e8483aadd11b..a3b339bcf3cf 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
@@ -305,7 +305,7 @@ static int sil_set_mode (struct ata_port *ap, struct ata_device **r_failed) | |||
305 | u32 tmp, dev_mode[2]; | 305 | u32 tmp, dev_mode[2]; |
306 | unsigned int i; | 306 | unsigned int i; |
307 | int rc; | 307 | int rc; |
308 | 308 | ||
309 | rc = ata_do_set_mode(ap, r_failed); | 309 | rc = ata_do_set_mode(ap, r_failed); |
310 | if (rc) | 310 | if (rc) |
311 | return rc; | 311 | return rc; |