diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-24 03:19:22 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-24 03:19:22 -0400 |
commit | cca3974e48607c3775dc73b544a5700b2e37c21a (patch) | |
tree | 0777d6121ba199af0aad196eb5a693510ec8e62e /drivers/ata/libata-bmdma.c | |
parent | 54a86bfc3d4601be9c36cd4e8a1bdc580c98fa6a (diff) |
libata: Grand renaming.
The biggest change is that ata_host_set is renamed to ata_host.
* ata_host_set => ata_host
* ata_probe_ent->host_flags => ata_probe_ent->port_flags
* ata_probe_ent->host_set_flags => ata_probe_ent->_host_flags
* ata_host_stats => ata_port_stats
* ata_port->host => ata_port->scsi_host
* ata_port->host_set => ata_port->host
* ata_port_info->host_flags => ata_port_info->flags
* ata_(.*)host_set(.*)\(\) => ata_\1host\2()
The leading underscore in ata_probe_ent->_host_flags is to avoid
reusing ->host_flags for different purpose. Currently, the only user
of the field is libata-bmdma.c and probe_ent itself is scheduled to be
removed.
ata_port->host is reused for different purpose but this field is used
inside libata core proper and of different type.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-bmdma.c')
-rw-r--r-- | drivers/ata/libata-bmdma.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/ata/libata-bmdma.c b/drivers/ata/libata-bmdma.c index 158f62dbf21b..760502859821 100644 --- a/drivers/ata/libata-bmdma.c +++ b/drivers/ata/libata-bmdma.c | |||
@@ -193,7 +193,7 @@ void ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf) | |||
193 | * synchronization with interrupt handler / other threads. | 193 | * synchronization with interrupt handler / other threads. |
194 | * | 194 | * |
195 | * LOCKING: | 195 | * LOCKING: |
196 | * spin_lock_irqsave(host_set lock) | 196 | * spin_lock_irqsave(host lock) |
197 | */ | 197 | */ |
198 | 198 | ||
199 | static void ata_exec_command_pio(struct ata_port *ap, const struct ata_taskfile *tf) | 199 | static void ata_exec_command_pio(struct ata_port *ap, const struct ata_taskfile *tf) |
@@ -216,7 +216,7 @@ static void ata_exec_command_pio(struct ata_port *ap, const struct ata_taskfile | |||
216 | * FIXME: missing write posting for 400nS delay enforcement | 216 | * FIXME: missing write posting for 400nS delay enforcement |
217 | * | 217 | * |
218 | * LOCKING: | 218 | * LOCKING: |
219 | * spin_lock_irqsave(host_set lock) | 219 | * spin_lock_irqsave(host lock) |
220 | */ | 220 | */ |
221 | 221 | ||
222 | static void ata_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile *tf) | 222 | static void ata_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile *tf) |
@@ -237,7 +237,7 @@ static void ata_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile | |||
237 | * synchronization with interrupt handler / other threads. | 237 | * synchronization with interrupt handler / other threads. |
238 | * | 238 | * |
239 | * LOCKING: | 239 | * LOCKING: |
240 | * spin_lock_irqsave(host_set lock) | 240 | * spin_lock_irqsave(host lock) |
241 | */ | 241 | */ |
242 | void ata_exec_command(struct ata_port *ap, const struct ata_taskfile *tf) | 242 | void ata_exec_command(struct ata_port *ap, const struct ata_taskfile *tf) |
243 | { | 243 | { |
@@ -422,7 +422,7 @@ u8 ata_altstatus(struct ata_port *ap) | |||
422 | * @qc: Info associated with this ATA transaction. | 422 | * @qc: Info associated with this ATA transaction. |
423 | * | 423 | * |
424 | * LOCKING: | 424 | * LOCKING: |
425 | * spin_lock_irqsave(host_set lock) | 425 | * spin_lock_irqsave(host lock) |
426 | */ | 426 | */ |
427 | 427 | ||
428 | static void ata_bmdma_setup_mmio (struct ata_queued_cmd *qc) | 428 | static void ata_bmdma_setup_mmio (struct ata_queued_cmd *qc) |
@@ -452,7 +452,7 @@ static void ata_bmdma_setup_mmio (struct ata_queued_cmd *qc) | |||
452 | * @qc: Info associated with this ATA transaction. | 452 | * @qc: Info associated with this ATA transaction. |
453 | * | 453 | * |
454 | * LOCKING: | 454 | * LOCKING: |
455 | * spin_lock_irqsave(host_set lock) | 455 | * spin_lock_irqsave(host lock) |
456 | */ | 456 | */ |
457 | 457 | ||
458 | static void ata_bmdma_start_mmio (struct ata_queued_cmd *qc) | 458 | static void ata_bmdma_start_mmio (struct ata_queued_cmd *qc) |
@@ -483,7 +483,7 @@ static void ata_bmdma_start_mmio (struct ata_queued_cmd *qc) | |||
483 | * @qc: Info associated with this ATA transaction. | 483 | * @qc: Info associated with this ATA transaction. |
484 | * | 484 | * |
485 | * LOCKING: | 485 | * LOCKING: |
486 | * spin_lock_irqsave(host_set lock) | 486 | * spin_lock_irqsave(host lock) |
487 | */ | 487 | */ |
488 | 488 | ||
489 | static void ata_bmdma_setup_pio (struct ata_queued_cmd *qc) | 489 | static void ata_bmdma_setup_pio (struct ata_queued_cmd *qc) |
@@ -511,7 +511,7 @@ static void ata_bmdma_setup_pio (struct ata_queued_cmd *qc) | |||
511 | * @qc: Info associated with this ATA transaction. | 511 | * @qc: Info associated with this ATA transaction. |
512 | * | 512 | * |
513 | * LOCKING: | 513 | * LOCKING: |
514 | * spin_lock_irqsave(host_set lock) | 514 | * spin_lock_irqsave(host lock) |
515 | */ | 515 | */ |
516 | 516 | ||
517 | static void ata_bmdma_start_pio (struct ata_queued_cmd *qc) | 517 | static void ata_bmdma_start_pio (struct ata_queued_cmd *qc) |
@@ -535,7 +535,7 @@ static void ata_bmdma_start_pio (struct ata_queued_cmd *qc) | |||
535 | * May be used as the bmdma_start() entry in ata_port_operations. | 535 | * May be used as the bmdma_start() entry in ata_port_operations. |
536 | * | 536 | * |
537 | * LOCKING: | 537 | * LOCKING: |
538 | * spin_lock_irqsave(host_set lock) | 538 | * spin_lock_irqsave(host lock) |
539 | */ | 539 | */ |
540 | void ata_bmdma_start(struct ata_queued_cmd *qc) | 540 | void ata_bmdma_start(struct ata_queued_cmd *qc) |
541 | { | 541 | { |
@@ -557,7 +557,7 @@ void ata_bmdma_start(struct ata_queued_cmd *qc) | |||
557 | * May be used as the bmdma_setup() entry in ata_port_operations. | 557 | * May be used as the bmdma_setup() entry in ata_port_operations. |
558 | * | 558 | * |
559 | * LOCKING: | 559 | * LOCKING: |
560 | * spin_lock_irqsave(host_set lock) | 560 | * spin_lock_irqsave(host lock) |
561 | */ | 561 | */ |
562 | void ata_bmdma_setup(struct ata_queued_cmd *qc) | 562 | void ata_bmdma_setup(struct ata_queued_cmd *qc) |
563 | { | 563 | { |
@@ -577,7 +577,7 @@ void ata_bmdma_setup(struct ata_queued_cmd *qc) | |||
577 | * May be used as the irq_clear() entry in ata_port_operations. | 577 | * May be used as the irq_clear() entry in ata_port_operations. |
578 | * | 578 | * |
579 | * LOCKING: | 579 | * LOCKING: |
580 | * spin_lock_irqsave(host_set lock) | 580 | * spin_lock_irqsave(host lock) |
581 | */ | 581 | */ |
582 | 582 | ||
583 | void ata_bmdma_irq_clear(struct ata_port *ap) | 583 | void ata_bmdma_irq_clear(struct ata_port *ap) |
@@ -605,7 +605,7 @@ void ata_bmdma_irq_clear(struct ata_port *ap) | |||
605 | * May be used as the bmdma_status() entry in ata_port_operations. | 605 | * May be used as the bmdma_status() entry in ata_port_operations. |
606 | * | 606 | * |
607 | * LOCKING: | 607 | * LOCKING: |
608 | * spin_lock_irqsave(host_set lock) | 608 | * spin_lock_irqsave(host lock) |
609 | */ | 609 | */ |
610 | 610 | ||
611 | u8 ata_bmdma_status(struct ata_port *ap) | 611 | u8 ata_bmdma_status(struct ata_port *ap) |
@@ -629,7 +629,7 @@ u8 ata_bmdma_status(struct ata_port *ap) | |||
629 | * May be used as the bmdma_stop() entry in ata_port_operations. | 629 | * May be used as the bmdma_stop() entry in ata_port_operations. |
630 | * | 630 | * |
631 | * LOCKING: | 631 | * LOCKING: |
632 | * spin_lock_irqsave(host_set lock) | 632 | * spin_lock_irqsave(host lock) |
633 | */ | 633 | */ |
634 | 634 | ||
635 | void ata_bmdma_stop(struct ata_queued_cmd *qc) | 635 | void ata_bmdma_stop(struct ata_queued_cmd *qc) |
@@ -838,7 +838,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int | |||
838 | bmdma = pci_resource_start(pdev, 4); | 838 | bmdma = pci_resource_start(pdev, 4); |
839 | if (bmdma) { | 839 | if (bmdma) { |
840 | if (inb(bmdma + 2) & 0x80) | 840 | if (inb(bmdma + 2) & 0x80) |
841 | probe_ent->host_set_flags |= ATA_HOST_SIMPLEX; | 841 | probe_ent->_host_flags |= ATA_HOST_SIMPLEX; |
842 | probe_ent->port[p].bmdma_addr = bmdma; | 842 | probe_ent->port[p].bmdma_addr = bmdma; |
843 | } | 843 | } |
844 | ata_std_ports(&probe_ent->port[p]); | 844 | ata_std_ports(&probe_ent->port[p]); |
@@ -854,7 +854,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int | |||
854 | if (bmdma) { | 854 | if (bmdma) { |
855 | bmdma += 8; | 855 | bmdma += 8; |
856 | if(inb(bmdma + 2) & 0x80) | 856 | if(inb(bmdma + 2) & 0x80) |
857 | probe_ent->host_set_flags |= ATA_HOST_SIMPLEX; | 857 | probe_ent->_host_flags |= ATA_HOST_SIMPLEX; |
858 | probe_ent->port[p].bmdma_addr = bmdma; | 858 | probe_ent->port[p].bmdma_addr = bmdma; |
859 | } | 859 | } |
860 | ata_std_ports(&probe_ent->port[p]); | 860 | ata_std_ports(&probe_ent->port[p]); |
@@ -887,7 +887,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, | |||
887 | if (bmdma) { | 887 | if (bmdma) { |
888 | probe_ent->port[0].bmdma_addr = bmdma; | 888 | probe_ent->port[0].bmdma_addr = bmdma; |
889 | if (inb(bmdma + 2) & 0x80) | 889 | if (inb(bmdma + 2) & 0x80) |
890 | probe_ent->host_set_flags |= ATA_HOST_SIMPLEX; | 890 | probe_ent->_host_flags |= ATA_HOST_SIMPLEX; |
891 | } | 891 | } |
892 | ata_std_ports(&probe_ent->port[0]); | 892 | ata_std_ports(&probe_ent->port[0]); |
893 | } else | 893 | } else |
@@ -904,7 +904,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, | |||
904 | if (bmdma) { | 904 | if (bmdma) { |
905 | probe_ent->port[1].bmdma_addr = bmdma + 8; | 905 | probe_ent->port[1].bmdma_addr = bmdma + 8; |
906 | if (inb(bmdma + 10) & 0x80) | 906 | if (inb(bmdma + 10) & 0x80) |
907 | probe_ent->host_set_flags |= ATA_HOST_SIMPLEX; | 907 | probe_ent->_host_flags |= ATA_HOST_SIMPLEX; |
908 | } | 908 | } |
909 | ata_std_ports(&probe_ent->port[1]); | 909 | ata_std_ports(&probe_ent->port[1]); |
910 | } else | 910 | } else |
@@ -957,7 +957,7 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, | |||
957 | else | 957 | else |
958 | port[1] = port[0]; | 958 | port[1] = port[0]; |
959 | 959 | ||
960 | if ((port[0]->host_flags & ATA_FLAG_NO_LEGACY) == 0 | 960 | if ((port[0]->flags & ATA_FLAG_NO_LEGACY) == 0 |
961 | && (pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) { | 961 | && (pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) { |
962 | /* TODO: What if one channel is in native mode ... */ | 962 | /* TODO: What if one channel is in native mode ... */ |
963 | pci_read_config_byte(pdev, PCI_CLASS_PROG, &tmp8); | 963 | pci_read_config_byte(pdev, PCI_CLASS_PROG, &tmp8); |