Commit e175435e authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

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

This reverts commit 1757d902.

Discussion continues upstream.
parent 7e15e9be

drivers/ata/libata-core.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -99,7 +99,6 @@ static void ata_dev_xfermask(struct ata_device *dev); 
static unsigned long ata_dev_blacklisted(const 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 ata_print_id = ATOMIC_INIT(0);

atomic_t host_print_id = ATOMIC_INIT(0);





struct ata_force_param {

struct ata_force_param {

	const char	*name;

	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++)

	for (i = host->n_ports; host->ports[i]; i++)

		kfree(host->ports[i]);

		kfree(host->ports[i]);





	/* track host controller */

	host->host_id = atomic_inc_return(&host_print_id);



	/* give ports names and add SCSI hosts */

	/* give ports names and add SCSI hosts */

	for (i = 0; i < host->n_ports; i++)

	for (i = 0; i < host->n_ports; i++)

		host->ports[i]->print_id = atomic_inc_return(&ata_print_id);

		host->ports[i]->print_id = atomic_inc_return(&ata_print_id);

drivers/ata/libata-transport.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -284,7 +284,7 @@ int ata_tport_add(struct device *parent, 




	dev->parent = get_device(parent);

	dev->parent = get_device(parent);

	dev->release = ata_tport_release;

	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);

	transport_setup_device(dev);

	error = device_add(dev);

	error = device_add(dev);

	if (error) {

	if (error) {

include/linux/libata.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -546,7 +546,6 @@ struct ata_host { 
	void			*private_data;

	void			*private_data;

	struct ata_port_operations *ops;

	struct ata_port_operations *ops;

	unsigned long		flags;

	unsigned long		flags;

	unsigned int            host_id; /* user visible host ID */





	struct mutex		eh_mutex;

	struct mutex		eh_mutex;

	struct task_struct	*eh_owner;

	struct task_struct	*eh_owner;