From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tejun Heo Subject: [PATCH 02/11] [libata] some function renaming Date: Wed, 2 Aug 2006 05:11:49 +0900 Message-ID: <11544631092784-git-send-email-htejun@gmail.com> References: <11544631081793-git-send-email-htejun@gmail.com> Reply-To: Tejun Heo Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Return-path: Received: from ug-out-1314.google.com ([66.249.92.175]:2909 "EHLO ug-out-1314.google.com") by vger.kernel.org with ESMTP id S932548AbWHAULz (ORCPT ); Tue, 1 Aug 2006 16:11:55 -0400 Received: by ug-out-1314.google.com with SMTP id m3so1473626ugc for ; Tue, 01 Aug 2006 13:11:54 -0700 (PDT) In-Reply-To: <11544631081793-git-send-email-htejun@gmail.com> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: jgarzik@pobox.com, alan@lxorguk.ukuu.org.ukjgarzik@pobox.com, akpm@osdl.org, davej@redhat.com, linux-ide@vger.kernel.org Cc: Jeff Garzik , Tejun Heo 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 Signed-off-by: Tejun Heo --- drivers/scsi/libata-core.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) dd8e6d7b6e5070c28359ed41bd876e2051672aff diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 66feebd..1cc12d4 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -5240,7 +5240,7 @@ void ata_dev_init(struct ata_device *dev } /** - * ata_host_init - Initialize an ata_port structure + * ata_port_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 @@ -5253,7 +5253,7 @@ void ata_dev_init(struct ata_device *dev * LOCKING: * Inherited from caller. */ -static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host, +static void ata_port_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) { @@ -5320,7 +5320,7 @@ #endif } /** - * 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 * @host_set: Collections of ports to which we add * @port_no: Port number associated with this host @@ -5334,7 +5334,7 @@ #endif * New ata_port on success, for NULL on error. */ -static struct ata_port * ata_host_add(const struct ata_probe_ent *ent, +static struct ata_port * ata_port_add(const struct ata_probe_ent *ent, struct ata_host_set *host_set, unsigned int port_no) { @@ -5359,7 +5359,7 @@ static struct ata_port * ata_host_add(co ap = ata_shost_to_port(host); - ata_host_init(ap, host, host_set, ent, port_no); + ata_port_init(ap, host, host_set, ent, port_no); rc = ap->ops->port_start(ap); if (rc) @@ -5418,7 +5418,7 @@ int ata_device_add(const struct ata_prob struct ata_port *ap; unsigned long xfer_mode_mask; - ap = ata_host_add(ent, host_set, i); + ap = ata_port_add(ent, host_set, i); if (!ap) goto err_out; -- 1.3.2