Commit 4608c160 authored by Tejun Heo's avatar Tejun Heo

[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: default avatarTejun Heo <htejun@gmail.com>
parent 3f066887
...@@ -5288,32 +5288,24 @@ void ata_port_init(struct ata_port *ap, struct ata_host_set *host_set, ...@@ -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 * ata_port_init_shost - Initialize SCSI host associated with ATA port
* @ap: Structure to initialize * @ap: ATA port to initialize SCSI host for
* @host: associated SCSI mid-layer structure * @shost: SCSI host associated with @ap
* @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
* *
* Initialize a new ata_port structure, and its associated * Initialize SCSI host @shost associated with ATA port @ap.
* scsi_host.
* *
* LOCKING: * LOCKING:
* Inherited from caller. * Inherited from caller.
*/ */
static void ata_port_init_shost(struct ata_port *ap, struct Scsi_Host *shost)
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)
{ {
ata_port_init(ap, host_set, ent, port_no); ap->host = shost;
ap->host = host;
host->unique_id = ap->id; shost->unique_id = ap->id;
host->max_id = 16; shost->max_id = 16;
host->max_lun = 1; shost->max_lun = 1;
host->max_channel = 1; shost->max_channel = 1;
host->max_cmd_len = 12; shost->max_cmd_len = 12;
} }
/** /**
...@@ -5356,7 +5348,8 @@ static struct ata_port * ata_host_add(const struct ata_probe_ent *ent, ...@@ -5356,7 +5348,8 @@ static struct ata_port * ata_host_add(const struct ata_probe_ent *ent,
ap = ata_shost_to_port(host); 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); rc = ap->ops->port_start(ap);
if (rc) if (rc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment