diff options
| author | Jeff Garzik <jeff@garzik.org> | 2013-01-25 15:30:23 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2013-01-25 15:30:23 -0500 |
| commit | e175435ed281d06ffd56d4edc8a2dd56f8672f07 (patch) | |
| tree | b6a623622b8e807400aa9a86d1068aa41485077a | |
| parent | 7e15e9be37eb834aaaca69030064ac97eaf5df2f (diff) | |
| download | olio-linux-3.10-e175435ed281d06ffd56d4edc8a2dd56f8672f07.tar.xz olio-linux-3.10-e175435ed281d06ffd56d4edc8a2dd56f8672f07.zip | |
Revert "libata: export host controller number thru /sys"
This reverts commit 1757d902b029a29dfcef63609964385cf8865b5a.
Discussion continues upstream.
| -rw-r--r-- | drivers/ata/libata-core.c | 4 | ||||
| -rw-r--r-- | drivers/ata/libata-transport.c | 2 | ||||
| -rw-r--r-- | include/linux/libata.h | 1 |
3 files changed, 1 insertions, 6 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) { diff --git a/include/linux/libata.h b/include/linux/libata.h index 65ff67e34b7..91c9d109e5f 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -546,7 +546,6 @@ struct ata_host { void *private_data; struct ata_port_operations *ops; unsigned long flags; - unsigned int host_id; /* user visible host ID */ struct mutex eh_mutex; struct task_struct *eh_owner; |