xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 1757d902b0.

Discussion continues upstream.
This commit is contained in:
Jeff Garzik
2013-01-25 15:30:23 -05:00
committed by Jeff Garzik
parent 7e15e9be37
commit e175435ed2
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ata/libata-core.c
View File

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

2
drivers/ata/libata-transport.c
View File

@@ -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) {

1
include/linux/libata.h
View File

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