[PATCH] [libata] some function renaming
s/ata_host_add/ata_port_add/ s/ata_host_init/ata_port_init/ libata naming got stuck in the middle of a Great Renaming: ata_host -> ata_port ata_host_set -> ata_host To eliminate confusion, let's just give up for now, and simply ensure that things are internally consistent. Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Tejun Heo <htejun@gmail.com>
This commit is contained in:
parent
4608c16085
commit
996139f1ce
|
@ -5309,7 +5309,7 @@ static void ata_port_init_shost(struct ata_port *ap, struct Scsi_Host *shost)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ata_host_add - Attach low-level ATA driver to system
|
* ata_port_add - Attach low-level ATA driver to system
|
||||||
* @ent: Information provided by low-level driver
|
* @ent: Information provided by low-level driver
|
||||||
* @host_set: Collections of ports to which we add
|
* @host_set: Collections of ports to which we add
|
||||||
* @port_no: Port number associated with this host
|
* @port_no: Port number associated with this host
|
||||||
|
@ -5322,12 +5322,11 @@ static void ata_port_init_shost(struct ata_port *ap, struct Scsi_Host *shost)
|
||||||
* RETURNS:
|
* RETURNS:
|
||||||
* New ata_port on success, for NULL on error.
|
* New ata_port on success, for NULL on error.
|
||||||
*/
|
*/
|
||||||
|
static struct ata_port * ata_port_add(const struct ata_probe_ent *ent,
|
||||||
static struct ata_port * ata_host_add(const struct ata_probe_ent *ent,
|
|
||||||
struct ata_host_set *host_set,
|
struct ata_host_set *host_set,
|
||||||
unsigned int port_no)
|
unsigned int port_no)
|
||||||
{
|
{
|
||||||
struct Scsi_Host *host;
|
struct Scsi_Host *shost;
|
||||||
struct ata_port *ap;
|
struct ata_port *ap;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
|
@ -5340,16 +5339,16 @@ static struct ata_port * ata_host_add(const struct ata_probe_ent *ent,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
host = scsi_host_alloc(ent->sht, sizeof(struct ata_port));
|
shost = scsi_host_alloc(ent->sht, sizeof(struct ata_port));
|
||||||
if (!host)
|
if (!shost)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
host->transportt = &ata_scsi_transport_template;
|
shost->transportt = &ata_scsi_transport_template;
|
||||||
|
|
||||||
ap = ata_shost_to_port(host);
|
ap = ata_shost_to_port(shost);
|
||||||
|
|
||||||
ata_port_init(ap, host_set, ent, port_no);
|
ata_port_init(ap, host_set, ent, port_no);
|
||||||
ata_port_init_shost(ap, host);
|
ata_port_init_shost(ap, shost);
|
||||||
|
|
||||||
rc = ap->ops->port_start(ap);
|
rc = ap->ops->port_start(ap);
|
||||||
if (rc)
|
if (rc)
|
||||||
|
@ -5358,7 +5357,7 @@ static struct ata_port * ata_host_add(const struct ata_probe_ent *ent,
|
||||||
return ap;
|
return ap;
|
||||||
|
|
||||||
err_out:
|
err_out:
|
||||||
scsi_host_put(host);
|
scsi_host_put(shost);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5427,7 +5426,7 @@ int ata_device_add(const struct ata_probe_ent *ent)
|
||||||
struct ata_port *ap;
|
struct ata_port *ap;
|
||||||
unsigned long xfer_mode_mask;
|
unsigned long xfer_mode_mask;
|
||||||
|
|
||||||
ap = ata_host_add(ent, host_set, i);
|
ap = ata_port_add(ent, host_set, i);
|
||||||
if (!ap)
|
if (!ap)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue