Revert "libata: export host controller number thru /sys"

This reverts commit 1757d902b029a29dfcef63609964385cf8865b5a.

Discussion continues upstream.

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index b7eed827daaea56baff7701ffea02cfc3ac8fec1..4b6fb48eb83111e61e95269c73466ea14508b65b 100644 (file)
--- 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 61dca7a20a31201b3725ed7ee04eda0817a5a1c3..c04d393d20c119d970d80d1b73e0e0e628b0f761 100644 (file)
--- 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 65ff67e34b77dd368b8261a2e9651bec3e0d7695..91c9d109e5f17bf39c88904cfaa635e132999c9e 100644 (file)
--- 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;