projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] fcoe: Use setup_timer() and mod_timer()
[linux-block.git]
/
drivers
/
scsi
/
scsi_transport_sas.c
diff --git
a/drivers/scsi/scsi_transport_sas.c
b/drivers/scsi/scsi_transport_sas.c
index 366609386be108341875da60d0f58ac02583d6d0..50988cbf7b2df90a1cc23d07e423c920b428e2ba 100644
(file)
--- a/
drivers/scsi/scsi_transport_sas.c
+++ b/
drivers/scsi/scsi_transport_sas.c
@@
-207,7
+207,7
@@
static int sas_bsg_initialize(struct Scsi_Host *shost, struct sas_rphy *rphy)
struct request_queue *q;
int error;
struct device *dev;
struct request_queue *q;
int error;
struct device *dev;
- char namebuf[
BUS_ID_SIZE
];
+ char namebuf[
20
];
const char *name;
void (*release)(struct device *);
const char *name;
void (*release)(struct device *);
@@
-219,7
+219,7
@@
static int sas_bsg_initialize(struct Scsi_Host *shost, struct sas_rphy *rphy)
if (rphy) {
q = blk_init_queue(sas_non_host_smp_request, NULL);
dev = &rphy->dev;
if (rphy) {
q = blk_init_queue(sas_non_host_smp_request, NULL);
dev = &rphy->dev;
- name = dev
->bus_id
;
+ name = dev
_name(dev)
;
release = NULL;
} else {
q = blk_init_queue(sas_host_smp_request, NULL);
release = NULL;
} else {
q = blk_init_queue(sas_host_smp_request, NULL);
@@
-629,10
+629,10
@@
struct sas_phy *sas_phy_alloc(struct device *parent, int number)
INIT_LIST_HEAD(&phy->port_siblings);
if (scsi_is_sas_expander_device(parent)) {
struct sas_rphy *rphy = dev_to_rphy(parent);
INIT_LIST_HEAD(&phy->port_siblings);
if (scsi_is_sas_expander_device(parent)) {
struct sas_rphy *rphy = dev_to_rphy(parent);
-
sprintf(phy->dev.bus_id
, "phy-%d:%d:%d", shost->host_no,
+
dev_set_name(&phy->dev
, "phy-%d:%d:%d", shost->host_no,
rphy->scsi_target_id, number);
} else
rphy->scsi_target_id, number);
} else
-
sprintf(phy->dev.bus_id
, "phy-%d:%d", shost->host_no, number);
+
dev_set_name(&phy->dev
, "phy-%d:%d", shost->host_no, number);
transport_setup_device(&phy->dev);
transport_setup_device(&phy->dev);
@@
-770,7
+770,7
@@
static void sas_port_create_link(struct sas_port *port,
int res;
res = sysfs_create_link(&port->dev.kobj, &phy->dev.kobj,
int res;
res = sysfs_create_link(&port->dev.kobj, &phy->dev.kobj,
-
phy->dev.bus_id
);
+
dev_name(&phy->dev)
);
if (res)
goto err;
res = sysfs_create_link(&phy->dev.kobj, &port->dev.kobj, "port");
if (res)
goto err;
res = sysfs_create_link(&phy->dev.kobj, &port->dev.kobj, "port");
@@
-785,7
+785,7
@@
err:
static void sas_port_delete_link(struct sas_port *port,
struct sas_phy *phy)
{
static void sas_port_delete_link(struct sas_port *port,
struct sas_phy *phy)
{
- sysfs_remove_link(&port->dev.kobj,
phy->dev.bus_id
);
+ sysfs_remove_link(&port->dev.kobj,
dev_name(&phy->dev)
);
sysfs_remove_link(&phy->dev.kobj, "port");
}
sysfs_remove_link(&phy->dev.kobj, "port");
}
@@
-821,11
+821,11
@@
struct sas_port *sas_port_alloc(struct device *parent, int port_id)
if (scsi_is_sas_expander_device(parent)) {
struct sas_rphy *rphy = dev_to_rphy(parent);
if (scsi_is_sas_expander_device(parent)) {
struct sas_rphy *rphy = dev_to_rphy(parent);
-
sprintf(port->dev.bus_id
, "port-%d:%d:%d", shost->host_no,
- rphy->scsi_target_id, port->port_identifier);
+
dev_set_name(&port->dev
, "port-%d:%d:%d", shost->host_no,
+
rphy->scsi_target_id, port->port_identifier);
} else
} else
-
sprintf(port->dev.bus_id
, "port-%d:%d", shost->host_no,
- port->port_identifier);
+
dev_set_name(&port->dev
, "port-%d:%d", shost->host_no,
+
port->port_identifier);
transport_setup_device(&port->dev);
transport_setup_device(&port->dev);
@@
-935,7
+935,7
@@
void sas_port_delete(struct sas_port *port)
if (port->is_backlink) {
struct device *parent = port->dev.parent;
if (port->is_backlink) {
struct device *parent = port->dev.parent;
- sysfs_remove_link(&port->dev.kobj,
parent->bus_id
);
+ sysfs_remove_link(&port->dev.kobj,
dev_name(parent)
);
port->is_backlink = 0;
}
port->is_backlink = 0;
}
@@
-984,7
+984,8
@@
void sas_port_add_phy(struct sas_port *port, struct sas_phy *phy)
/* If this trips, you added a phy that was already
* part of a different port */
if (unlikely(tmp != phy)) {
/* If this trips, you added a phy that was already
* part of a different port */
if (unlikely(tmp != phy)) {
- dev_printk(KERN_ERR, &port->dev, "trying to add phy %s fails: it's already part of another port\n", phy->dev.bus_id);
+ dev_printk(KERN_ERR, &port->dev, "trying to add phy %s fails: it's already part of another port\n",
+ dev_name(&phy->dev));
BUG();
}
} else {
BUG();
}
} else {
@@
-1023,7
+1024,7
@@
void sas_port_mark_backlink(struct sas_port *port)
return;
port->is_backlink = 1;
res = sysfs_create_link(&port->dev.kobj, &parent->kobj,
return;
port->is_backlink = 1;
res = sysfs_create_link(&port->dev.kobj, &parent->kobj,
-
parent->bus_id
);
+
dev_name(parent)
);
if (res)
goto err;
return;
if (res)
goto err;
return;
@@
-1367,11
+1368,12
@@
struct sas_rphy *sas_end_device_alloc(struct sas_port *parent)
rdev->rphy.dev.release = sas_end_device_release;
if (scsi_is_sas_expander_device(parent->dev.parent)) {
struct sas_rphy *rphy = dev_to_rphy(parent->dev.parent);
rdev->rphy.dev.release = sas_end_device_release;
if (scsi_is_sas_expander_device(parent->dev.parent)) {
struct sas_rphy *rphy = dev_to_rphy(parent->dev.parent);
- sprintf(rdev->rphy.dev.bus_id, "end_device-%d:%d:%d",
- shost->host_no, rphy->scsi_target_id, parent->port_identifier);
+ dev_set_name(&rdev->rphy.dev, "end_device-%d:%d:%d",
+ shost->host_no, rphy->scsi_target_id,
+ parent->port_identifier);
} else
} else
-
sprintf(rdev->rphy.dev.bus_id
, "end_device-%d:%d",
- shost->host_no, parent->port_identifier);
+
dev_set_name(&rdev->rphy.dev
, "end_device-%d:%d",
+
shost->host_no, parent->port_identifier);
rdev->rphy.identify.device_type = SAS_END_DEVICE;
sas_rphy_initialize(&rdev->rphy);
transport_setup_device(&rdev->rphy.dev);
rdev->rphy.identify.device_type = SAS_END_DEVICE;
sas_rphy_initialize(&rdev->rphy);
transport_setup_device(&rdev->rphy.dev);
@@
-1411,8
+1413,8
@@
struct sas_rphy *sas_expander_alloc(struct sas_port *parent,
mutex_lock(&sas_host->lock);
rdev->rphy.scsi_target_id = sas_host->next_expander_id++;
mutex_unlock(&sas_host->lock);
mutex_lock(&sas_host->lock);
rdev->rphy.scsi_target_id = sas_host->next_expander_id++;
mutex_unlock(&sas_host->lock);
-
sprintf(rdev->rphy.dev.bus_id
, "expander-%d:%d",
- shost->host_no, rdev->rphy.scsi_target_id);
+
dev_set_name(&rdev->rphy.dev
, "expander-%d:%d",
+
shost->host_no, rdev->rphy.scsi_target_id);
rdev->rphy.identify.device_type = type;
sas_rphy_initialize(&rdev->rphy);
transport_setup_device(&rdev->rphy.dev);
rdev->rphy.identify.device_type = type;
sas_rphy_initialize(&rdev->rphy);
transport_setup_device(&rdev->rphy.dev);
@@
-1445,7
+1447,7
@@
int sas_rphy_add(struct sas_rphy *rphy)
transport_add_device(&rphy->dev);
transport_configure_device(&rphy->dev);
if (sas_bsg_initialize(shost, rphy))
transport_add_device(&rphy->dev);
transport_configure_device(&rphy->dev);
if (sas_bsg_initialize(shost, rphy))
- printk("fail to a bsg device %s\n",
rphy->dev.bus_id
);
+ printk("fail to a bsg device %s\n",
dev_name(&rphy->dev)
);
mutex_lock(&sas_host->lock);
mutex_lock(&sas_host->lock);