aboutsummaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2013-01-25 15:30:23 -0500
committerJeff Garzik <jgarzik@redhat.com>2013-01-25 15:30:23 -0500
commite175435ed281d06ffd56d4edc8a2dd56f8672f07 (patch)
treeb6a623622b8e807400aa9a86d1068aa41485077a /drivers/ata
parent7e15e9be37eb834aaaca69030064ac97eaf5df2f (diff)
downloadvexpress-lsk-e175435ed281d06ffd56d4edc8a2dd56f8672f07.tar.gz
Revert "libata: export host controller number thru /sys"
This reverts commit 1757d902b029a29dfcef63609964385cf8865b5a. Discussion continues upstream.
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c4
-rw-r--r--drivers/ata/libata-transport.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index b7eed827daa..4b6fb48eb83 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -99,7 +99,6 @@ static void ata_dev_xfermask(struct ata_device *dev);
static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
atomic_t ata_print_id = ATOMIC_INIT(0);
-atomic_t host_print_id = ATOMIC_INIT(0);
struct ata_force_param {
const char *name;
@@ -6119,9 +6118,6 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
for (i = host->n_ports; host->ports[i]; i++)
kfree(host->ports[i]);
- /* track host controller */
- host->host_id = atomic_inc_return(&host_print_id);
-
/* give ports names and add SCSI hosts */
for (i = 0; i < host->n_ports; i++)
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c
index 61dca7a20a3..c04d393d20c 100644
--- a/drivers/ata/libata-transport.c
+++ b/drivers/ata/libata-transport.c
@@ -284,7 +284,7 @@ int ata_tport_add(struct device *parent,
dev->parent = get_device(parent);
dev->release = ata_tport_release;
- dev_set_name(dev, "ata%d.%d", ap->host->host_id, ap->print_id);
+ dev_set_name(dev, "ata%d", ap->print_id);
transport_setup_device(dev);
error = device_add(dev);
if (error) {