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/sata_svw.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/sata_svw.c')
-rw-r--r-- | drivers/ata/sata_svw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index baf259a966d0..2a7e3495cf16 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
@@ -169,7 +169,7 @@ static void k2_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf) | |||
169 | * @qc: Info associated with this ATA transaction. | 169 | * @qc: Info associated with this ATA transaction. |
170 | * | 170 | * |
171 | * LOCKING: | 171 | * LOCKING: |
172 | * spin_lock_irqsave(host_set lock) | 172 | * spin_lock_irqsave(host lock) |
173 | */ | 173 | */ |
174 | 174 | ||
175 | static void k2_bmdma_setup_mmio (struct ata_queued_cmd *qc) | 175 | static void k2_bmdma_setup_mmio (struct ata_queued_cmd *qc) |
@@ -199,7 +199,7 @@ static void k2_bmdma_setup_mmio (struct ata_queued_cmd *qc) | |||
199 | * @qc: Info associated with this ATA transaction. | 199 | * @qc: Info associated with this ATA transaction. |
200 | * | 200 | * |
201 | * LOCKING: | 201 | * LOCKING: |
202 | * spin_lock_irqsave(host_set lock) | 202 | * spin_lock_irqsave(host lock) |
203 | */ | 203 | */ |
204 | 204 | ||
205 | static void k2_bmdma_start_mmio (struct ata_queued_cmd *qc) | 205 | static void k2_bmdma_start_mmio (struct ata_queued_cmd *qc) |
@@ -261,12 +261,12 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start, | |||
261 | return 0; | 261 | return 0; |
262 | 262 | ||
263 | /* Find the OF node for the PCI device proper */ | 263 | /* Find the OF node for the PCI device proper */ |
264 | np = pci_device_to_OF_node(to_pci_dev(ap->host_set->dev)); | 264 | np = pci_device_to_OF_node(to_pci_dev(ap->host->dev)); |
265 | if (np == NULL) | 265 | if (np == NULL) |
266 | return 0; | 266 | return 0; |
267 | 267 | ||
268 | /* Match it to a port node */ | 268 | /* Match it to a port node */ |
269 | index = (ap == ap->host_set->ports[0]) ? 0 : 1; | 269 | index = (ap == ap->host->ports[0]) ? 0 : 1; |
270 | for (np = np->child; np != NULL; np = np->sibling) { | 270 | for (np = np->child; np != NULL; np = np->sibling) { |
271 | u32 *reg = (u32 *)get_property(np, "reg", NULL); | 271 | u32 *reg = (u32 *)get_property(np, "reg", NULL); |
272 | if (!reg) | 272 | if (!reg) |
@@ -423,7 +423,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e | |||
423 | writel(0x0, mmio_base + K2_SATA_SIM_OFFSET); | 423 | writel(0x0, mmio_base + K2_SATA_SIM_OFFSET); |
424 | 424 | ||
425 | probe_ent->sht = &k2_sata_sht; | 425 | probe_ent->sht = &k2_sata_sht; |
426 | probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 426 | probe_ent->port_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
427 | ATA_FLAG_MMIO; | 427 | ATA_FLAG_MMIO; |
428 | probe_ent->port_ops = &k2_sata_ops; | 428 | probe_ent->port_ops = &k2_sata_ops; |
429 | probe_ent->n_ports = 4; | 429 | probe_ent->n_ports = 4; |