diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-08-10 16:59:01 +0900 |
|---|---|---|
| committer | Tejun Heo <htejun@gmail.com> | 2006-08-10 16:59:01 +0900 |
| commit | 4608c1608501cf2b0dc4478c9b6c3902db58408a (patch) | |
| tree | 5b179b34ff3878498c887d5ae9c409f6044342e9 | |
| parent | 3f066887595de490c411762ce58a31412b09e939 (diff) | |
[PATCH] libata: update ata_host_init() and rename it to ata_port_init_shost()
Update ata_host_init() such that it only initializes SCSI host related
stuff and doesn't call into ata_port_init(), and rename it to
ata_port_init_shost().
Signed-off-by: Tejun Heo <htejun@gmail.com>
| -rw-r--r-- | drivers/scsi/libata-core.c | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 83d93fc0751..eb9de073639 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -5288,32 +5288,24 @@ void ata_port_init(struct ata_port *ap, struct ata_host_set *host_set, } /** - * ata_host_init - Initialize an ata_port structure - * @ap: Structure to initialize - * @host: associated SCSI mid-layer structure - * @host_set: Collection of hosts to which @ap belongs - * @ent: Probe information provided by low-level driver - * @port_no: Port number associated with this ata_port + * ata_port_init_shost - Initialize SCSI host associated with ATA port + * @ap: ATA port to initialize SCSI host for + * @shost: SCSI host associated with @ap * - * Initialize a new ata_port structure, and its associated - * scsi_host. + * Initialize SCSI host @shost associated with ATA port @ap. * * LOCKING: * Inherited from caller. */ - -static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host, - struct ata_host_set *host_set, - const struct ata_probe_ent *ent, unsigned int port_no) +static void ata_port_init_shost(struct ata_port *ap, struct Scsi_Host *shost) { - ata_port_init(ap, host_set, ent, port_no); - ap->host = host; + ap->host = shost; - host->unique_id = ap->id; - host->max_id = 16; - host->max_lun = 1; - host->max_channel = 1; - host->max_cmd_len = 12; + shost->unique_id = ap->id; + shost->max_id = 16; + shost->max_lun = 1; + shost->max_channel = 1; + shost->max_cmd_len = 12; } /** @@ -5356,7 +5348,8 @@ static struct ata_port * ata_host_add(const struct ata_probe_ent *ent, ap = ata_shost_to_port(host); - ata_host_init(ap, host, host_set, ent, port_no); + ata_port_init(ap, host_set, ent, port_no); + ata_port_init_shost(ap, host); rc = ap->ops->port_start(ap); if (rc) |