dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[SCSI] struct device - replace bus_id with dev_name(), dev_set_name() 

[jejb: limit ioctl to returning 20 characters to avoid overrun
       on long device names and add a few more conversions]
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Kay Sievers 2008-12-03 22:41:36 +01:00 committed by James Bottomley
parent b58602a4ba
commit 71610f55fa
26 changed files with 79 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/misc/enclosure.c
View File

@ -119,7 +119,7 @@ enclosure_register(struct device *dev, const char *name, int components,
edev->edev.class = &enclosure_class; edev->edev.class = &enclosure_class;
edev->edev.parent = get_device(dev); edev->edev.parent = get_device(dev);
edev->cb = cb; edev->cb = cb;
snprintf(edev->edev.bus_id, BUS_ID_SIZE, "%s", name); dev_set_name(&edev->edev, name);
err = device_register(&edev->edev); err = device_register(&edev->edev);
if (err) if (err)
goto err; goto err;
@ -170,7 +170,7 @@ EXPORT_SYMBOL_GPL(enclosure_unregister);
static void enclosure_link_name(struct enclosure_component *cdev, char *name) static void enclosure_link_name(struct enclosure_component *cdev, char *name)
{ {
strcpy(name, "enclosure_device:"); strcpy(name, "enclosure_device:");
strcat(name, cdev->cdev.bus_id); strcat(name, dev_name(&cdev->cdev));
} }
static void enclosure_remove_links(struct enclosure_component *cdev) static void enclosure_remove_links(struct enclosure_component *cdev)
@ -256,9 +256,9 @@ enclosure_component_register(struct enclosure_device *edev,
cdev = &ecomp->cdev; cdev = &ecomp->cdev;
cdev->parent = get_device(&edev->edev); cdev->parent = get_device(&edev->edev);
if (name) if (name)
snprintf(cdev->bus_id, BUS_ID_SIZE, "%s", name); dev_set_name(cdev, name);
else else
snprintf(cdev->bus_id, BUS_ID_SIZE, "%u", number); dev_set_name(cdev, "%u", number);
cdev->release = enclosure_component_release; cdev->release = enclosure_component_release;
cdev->groups = enclosure_groups; cdev->groups = enclosure_groups;

2
drivers/scsi/NCR_D700.c
View File

@ -318,7 +318,7 @@ NCR_D700_probe(struct device *dev)
return -ENOMEM; return -ENOMEM;
p->dev = dev; p->dev = dev;
snprintf(p->name, sizeof(p->name), "D700(%s)", dev->bus_id); snprintf(p->name, sizeof(p->name), "D700(%s)", dev_name(dev));
if (request_irq(irq, NCR_D700_intr, IRQF_SHARED, p->name, p)) { if (request_irq(irq, NCR_D700_intr, IRQF_SHARED, p->name, p)) {
printk(KERN_ERR "D700: request_irq failed\n"); printk(KERN_ERR "D700: request_irq failed\n");
kfree(p); kfree(p);

2
drivers/scsi/advansys.c
View File

@ -2527,7 +2527,7 @@ static void asc_prt_scsi_host(struct Scsi_Host *s)
{ {
struct asc_board *boardp = shost_priv(s); struct asc_board *boardp = shost_priv(s);
printk("Scsi_Host at addr 0x%p, device %s\n", s, boardp->dev->bus_id); printk("Scsi_Host at addr 0x%p, device %s\n", s, dev_name(boardp->dev));
printk(" host_busy %u, host_no %d, last_reset %d,\n", printk(" host_busy %u, host_no %d, last_reset %d,\n",
s->host_busy, s->host_no, (unsigned)s->last_reset); s->host_busy, s->host_no, (unsigned)s->last_reset);

2
drivers/scsi/aic94xx/aic94xx_tmf.c
View File

@ -189,7 +189,7 @@ int asd_I_T_nexus_reset(struct domain_device *dev)
asd_clear_nexus_I_T(dev, NEXUS_PHASE_PRE); asd_clear_nexus_I_T(dev, NEXUS_PHASE_PRE);
/* send a hard reset */ /* send a hard reset */
ASD_DPRINTK("sending %s reset to %s\n", ASD_DPRINTK("sending %s reset to %s\n",
reset_type ? "hard" : "soft", phy->dev.bus_id); reset_type ? "hard" : "soft", dev_name(&phy->dev));
res = sas_phy_reset(phy, reset_type); res = sas_phy_reset(phy, reset_type);
if (res == TMF_RESP_FUNC_COMPLETE) { if (res == TMF_RESP_FUNC_COMPLETE) {
/* wait for the maximum settle time */ /* wait for the maximum settle time */

6
drivers/scsi/hosts.c
View File

@ -388,8 +388,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
shost->dma_boundary = 0xffffffff; shost->dma_boundary = 0xffffffff;
device_initialize(&shost->shost_gendev); device_initialize(&shost->shost_gendev);
snprintf(shost->shost_gendev.bus_id, BUS_ID_SIZE, "host%d", dev_set_name(&shost->shost_gendev, "host%d", shost->host_no);
shost->host_no);
#ifndef CONFIG_SYSFS_DEPRECATED #ifndef CONFIG_SYSFS_DEPRECATED
shost->shost_gendev.bus = &scsi_bus_type; shost->shost_gendev.bus = &scsi_bus_type;
#endif #endif
@ -398,8 +397,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
device_initialize(&shost->shost_dev); device_initialize(&shost->shost_dev);
shost->shost_dev.parent = &shost->shost_gendev; shost->shost_dev.parent = &shost->shost_gendev;
shost->shost_dev.class = &shost_class; shost->shost_dev.class = &shost_class;
snprintf(shost->shost_dev.bus_id, BUS_ID_SIZE, "host%d", dev_set_name(&shost->shost_dev, "host%d", shost->host_no);
shost->host_no);
shost->shost_dev.groups = scsi_sysfs_shost_attr_groups; shost->shost_dev.groups = scsi_sysfs_shost_attr_groups;
shost->ehandler = kthread_run(scsi_error_handler, shost, shost->ehandler = kthread_run(scsi_error_handler, shost,

4
drivers/scsi/ibmvscsi/ibmvfc.c
View File

@ -1145,10 +1145,10 @@ static void ibmvfc_set_login_info(struct ibmvfc_host *vhost)
login_info->async.len = vhost->async_crq.size * sizeof(*vhost->async_crq.msgs); login_info->async.len = vhost->async_crq.size * sizeof(*vhost->async_crq.msgs);
strncpy(login_info->partition_name, vhost->partition_name, IBMVFC_MAX_NAME); strncpy(login_info->partition_name, vhost->partition_name, IBMVFC_MAX_NAME);
strncpy(login_info->device_name, strncpy(login_info->device_name,
vhost->host->shost_gendev.bus_id, IBMVFC_MAX_NAME); dev_name(&vhost->host->shost_gendev), IBMVFC_MAX_NAME);
location = of_get_property(of_node, "ibm,loc-code", NULL); location = of_get_property(of_node, "ibm,loc-code", NULL);
location = location ? location : vhost->dev->bus_id; location = location ? location : dev_name(vhost->dev);
strncpy(login_info->drc_name, location, IBMVFC_MAX_NAME); strncpy(login_info->drc_name, location, IBMVFC_MAX_NAME);
} }

2
drivers/scsi/ipr.c
View File

@ -2184,7 +2184,7 @@ static void ipr_dump_location_data(struct ipr_ioa_cfg *ioa_cfg,
sizeof(struct ipr_dump_entry_header); sizeof(struct ipr_dump_entry_header);
driver_dump->location_entry.hdr.data_type = IPR_DUMP_DATA_TYPE_ASCII; driver_dump->location_entry.hdr.data_type = IPR_DUMP_DATA_TYPE_ASCII;
driver_dump->location_entry.hdr.id = IPR_DUMP_LOCATION_ID; driver_dump->location_entry.hdr.id = IPR_DUMP_LOCATION_ID;
strcpy(driver_dump->location_entry.location, ioa_cfg->pdev->dev.bus_id); strcpy(driver_dump->location_entry.location, dev_name(&ioa_cfg->pdev->dev));
driver_dump->hdr.num_entries++; driver_dump->hdr.num_entries++;
} }

2
drivers/scsi/ipr.h
View File

@ -1272,7 +1272,7 @@ struct ipr_dump_entry_header {
struct ipr_dump_location_entry { struct ipr_dump_location_entry {
struct ipr_dump_entry_header hdr; struct ipr_dump_entry_header hdr;
u8 location[BUS_ID_SIZE]; u8 location[20];
}__attribute__((packed)); }__attribute__((packed));
struct ipr_dump_trace_entry { struct ipr_dump_trace_entry {

3
drivers/scsi/lasi700.c
View File

@ -103,8 +103,7 @@ lasi700_probe(struct parisc_device *dev)
hostdata = kzalloc(sizeof(*hostdata), GFP_KERNEL); hostdata = kzalloc(sizeof(*hostdata), GFP_KERNEL);
if (!hostdata) { if (!hostdata) {
printk(KERN_ERR "%s: Failed to allocate host data\n", dev_printk(KERN_ERR, dev, "Failed to allocate host data\n");
dev->dev.bus_id);
return -ENOMEM; return -ENOMEM;
} }

2
drivers/scsi/libsas/sas_discover.c
View File

@ -169,7 +169,7 @@ int sas_notify_lldd_dev_found(struct domain_device *dev)
if (res) { if (res) {
printk("sas: driver on pcidev %s cannot handle " printk("sas: driver on pcidev %s cannot handle "
"device %llx, error:%d\n", "device %llx, error:%d\n",
sas_ha->dev->bus_id, dev_name(sas_ha->dev),
SAS_ADDR(dev->sas_addr), res); SAS_ADDR(dev->sas_addr), res);
} }
} }

2
drivers/scsi/libsas/sas_dump.c
View File

@ -56,7 +56,7 @@ void sas_dprint_phye(int phyid, enum phy_event pe)
void sas_dprint_hae(struct sas_ha_struct *sas_ha, enum ha_event he) void sas_dprint_hae(struct sas_ha_struct *sas_ha, enum ha_event he)
{ {
SAS_DPRINTK("ha %s: %s event\n", sas_ha->dev->bus_id, SAS_DPRINTK("ha %s: %s event\n", dev_name(sas_ha->dev),
sas_hae_str[he]); sas_hae_str[he]);
} }

2
drivers/scsi/libsas/sas_port.c
View File

@ -113,7 +113,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
sas_port_add_phy(port->port, phy->phy); sas_port_add_phy(port->port, phy->phy);
SAS_DPRINTK("%s added to %s, phy_mask:0x%x (%16llx)\n", SAS_DPRINTK("%s added to %s, phy_mask:0x%x (%16llx)\n",
phy->phy->dev.bus_id,port->port->dev.bus_id, dev_name(&phy->phy->dev), dev_name(&port->port->dev),
port->phy_mask, port->phy_mask,
SAS_ADDR(port->attached_sas_addr)); SAS_ADDR(port->attached_sas_addr));

3
drivers/scsi/raid_class.c
View File

@ -237,8 +237,7 @@ int raid_component_add(struct raid_template *r,struct device *raid_dev,
rc->dev.parent = get_device(component_dev); rc->dev.parent = get_device(component_dev);
rc->num = rd->component_count++; rc->num = rd->component_count++;
snprintf(rc->dev.bus_id, sizeof(rc->dev.bus_id), dev_set_name(&rc->dev, "component-%d", rc->num);
"component-%d", rc->num);
list_add_tail(&rc->node, &rd->component_list); list_add_tail(&rc->node, &rd->component_list);
rc->dev.class = &raid_class.class; rc->dev.class = &raid_class.class;
err = device_add(&rc->dev); err = device_add(&rc->dev);

4
drivers/scsi/scsi_debug.c
View File

@ -2508,7 +2508,7 @@ static void pseudo_0_release(struct device *dev)
} }
static struct device pseudo_primary = { static struct device pseudo_primary = {
.bus_id = "pseudo_0", .init_name = "pseudo_0",
.release = pseudo_0_release, .release = pseudo_0_release,
}; };
@ -2680,7 +2680,7 @@ static int sdebug_add_adapter(void)
sdbg_host->dev.bus = &pseudo_lld_bus; sdbg_host->dev.bus = &pseudo_lld_bus;
sdbg_host->dev.parent = &pseudo_primary; sdbg_host->dev.parent = &pseudo_primary;
sdbg_host->dev.release = &sdebug_release_adapter; sdbg_host->dev.release = &sdebug_release_adapter;
sprintf(sdbg_host->dev.bus_id, "adapter%d", scsi_debug_add_host); dev_set_name(&sdbg_host->dev, "adapter%d", scsi_debug_add_host);
error = device_register(&sdbg_host->dev); error = device_register(&sdbg_host->dev);

9
drivers/scsi/scsi_ioctl.c
View File

@ -167,10 +167,17 @@ EXPORT_SYMBOL(scsi_set_medium_removal);
static int scsi_ioctl_get_pci(struct scsi_device *sdev, void __user *arg) static int scsi_ioctl_get_pci(struct scsi_device *sdev, void __user *arg)
{ {
struct device *dev = scsi_get_device(sdev->host); struct device *dev = scsi_get_device(sdev->host);
const char *name;
if (!dev) if (!dev)
return -ENXIO; return -ENXIO;
return copy_to_user(arg, dev->bus_id, sizeof(dev->bus_id))? -EFAULT: 0;
name = dev_name(dev);
/* compatibility with old ioctl which only returned
* 20 characters */
return copy_to_user(arg, name, min(strlen(name), (size_t)20))
? -EFAULT: 0;
} }

7
drivers/scsi/scsi_scan.c
View File

@ -411,8 +411,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
device_initialize(dev); device_initialize(dev);
starget->reap_ref = 1; starget->reap_ref = 1;
dev->parent = get_device(parent); dev->parent = get_device(parent);
sprintf(dev->bus_id, "target%d:%d:%d", dev_set_name(dev, "target%d:%d:%d", shost->host_no, channel, id);
shost->host_no, channel, id);
#ifndef CONFIG_SYSFS_DEPRECATED #ifndef CONFIG_SYSFS_DEPRECATED
dev->bus = &scsi_bus_type; dev->bus = &scsi_bus_type;
#endif #endif
@ -1021,7 +1020,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
if (rescan || !scsi_device_created(sdev)) { if (rescan || !scsi_device_created(sdev)) {
SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO
"scsi scan: device exists on %s\n", "scsi scan: device exists on %s\n",
sdev->sdev_gendev.bus_id)); dev_name(&sdev->sdev_gendev)));
if (sdevp) if (sdevp)
*sdevp = sdev; *sdevp = sdev;
else else
@ -1160,7 +1159,7 @@ static void scsi_sequential_lun_scan(struct scsi_target *starget,
struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: Sequential scan of" SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: Sequential scan of"
"%s\n", starget->dev.bus_id)); "%s\n", dev_name(&starget->dev)));
max_dev_lun = min(max_scsi_luns, shost->max_lun); max_dev_lun = min(max_scsi_luns, shost->max_lun);
/* /*

12
drivers/scsi/scsi_sysfs.c
View File

@ -1079,16 +1079,14 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)
device_initialize(&sdev->sdev_gendev); device_initialize(&sdev->sdev_gendev);
sdev->sdev_gendev.bus = &scsi_bus_type; sdev->sdev_gendev.bus = &scsi_bus_type;
sdev->sdev_gendev.type = &scsi_dev_type; sdev->sdev_gendev.type = &scsi_dev_type;
sprintf(sdev->sdev_gendev.bus_id,"%d:%d:%d:%d", dev_set_name(&sdev->sdev_gendev, "%d:%d:%d:%d",
sdev->host->host_no, sdev->channel, sdev->id, sdev->host->host_no, sdev->channel, sdev->id, sdev->lun);
sdev->lun);
device_initialize(&sdev->sdev_dev); device_initialize(&sdev->sdev_dev);
sdev->sdev_dev.parent = &sdev->sdev_gendev; sdev->sdev_dev.parent = &sdev->sdev_gendev;
sdev->sdev_dev.class = &sdev_class; sdev->sdev_dev.class = &sdev_class;
snprintf(sdev->sdev_dev.bus_id, BUS_ID_SIZE, dev_set_name(&sdev->sdev_dev, "%d:%d:%d:%d",
"%d:%d:%d:%d", sdev->host->host_no, sdev->host->host_no, sdev->channel, sdev->id, sdev->lun);
sdev->channel, sdev->id, sdev->lun);
sdev->scsi_level = starget->scsi_level; sdev->scsi_level = starget->scsi_level;
transport_setup_device(&sdev->sdev_gendev); transport_setup_device(&sdev->sdev_gendev);
spin_lock_irqsave(shost->host_lock, flags); spin_lock_irqsave(shost->host_lock, flags);

18
drivers/scsi/scsi_transport_fc.c
View File

@ -2486,8 +2486,8 @@ fc_rport_create(struct Scsi_Host *shost, int channel,
device_initialize(dev); /* takes self reference */ device_initialize(dev); /* takes self reference */
dev->parent = get_device(&shost->shost_gendev); /* parent reference */ dev->parent = get_device(&shost->shost_gendev); /* parent reference */
dev->release = fc_rport_dev_release; dev->release = fc_rport_dev_release;
sprintf(dev->bus_id, "rport-%d:%d-%d", dev_set_name(dev, "rport-%d:%d-%d",
shost->host_no, channel, rport->number); shost->host_no, channel, rport->number);
transport_setup_device(dev); transport_setup_device(dev);
error = device_add(dev); error = device_add(dev);
@ -3164,8 +3164,8 @@ fc_vport_setup(struct Scsi_Host *shost, int channel, struct device *pdev,
device_initialize(dev); /* takes self reference */ device_initialize(dev); /* takes self reference */
dev->parent = get_device(pdev); /* takes parent reference */ dev->parent = get_device(pdev); /* takes parent reference */
dev->release = fc_vport_dev_release; dev->release = fc_vport_dev_release;
sprintf(dev->bus_id, "vport-%d:%d-%d", dev_set_name(dev, "vport-%d:%d-%d",
shost->host_no, channel, vport->number); shost->host_no, channel, vport->number);
transport_setup_device(dev); transport_setup_device(dev);
error = device_add(dev); error = device_add(dev);
@ -3188,19 +3188,19 @@ fc_vport_setup(struct Scsi_Host *shost, int channel, struct device *pdev,
*/ */
if (pdev != &shost->shost_gendev) { if (pdev != &shost->shost_gendev) {
error = sysfs_create_link(&shost->shost_gendev.kobj, error = sysfs_create_link(&shost->shost_gendev.kobj,
&dev->kobj, dev->bus_id); &dev->kobj, dev_name(dev));
if (error) if (error)
printk(KERN_ERR printk(KERN_ERR
"%s: Cannot create vport symlinks for " "%s: Cannot create vport symlinks for "
"%s, err=%d\n", "%s, err=%d\n",
__func__, dev->bus_id, error); __func__, dev_name(dev), error);
} }
spin_lock_irqsave(shost->host_lock, flags); spin_lock_irqsave(shost->host_lock, flags);
vport->flags &= ~FC_VPORT_CREATING; vport->flags &= ~FC_VPORT_CREATING;
spin_unlock_irqrestore(shost->host_lock, flags); spin_unlock_irqrestore(shost->host_lock, flags);
dev_printk(KERN_NOTICE, pdev, dev_printk(KERN_NOTICE, pdev,
"%s created via shost%d channel %d\n", dev->bus_id, "%s created via shost%d channel %d\n", dev_name(dev),
shost->host_no, channel); shost->host_no, channel);
*ret_vport = vport; *ret_vport = vport;
@ -3297,7 +3297,7 @@ fc_vport_terminate(struct fc_vport *vport)
return stat; return stat;
if (dev->parent != &shost->shost_gendev) if (dev->parent != &shost->shost_gendev)
sysfs_remove_link(&shost->shost_gendev.kobj, dev->bus_id); sysfs_remove_link(&shost->shost_gendev.kobj, dev_name(dev));
transport_remove_device(dev); transport_remove_device(dev);
device_del(dev); device_del(dev);
transport_destroy_device(dev); transport_destroy_device(dev);
@ -3329,7 +3329,7 @@ fc_vport_sched_delete(struct work_struct *work)
dev_printk(KERN_ERR, vport->dev.parent, dev_printk(KERN_ERR, vport->dev.parent,
"%s: %s could not be deleted created via " "%s: %s could not be deleted created via "
"shost%d channel %d - error %d\n", __func__, "shost%d channel %d - error %d\n", __func__,
vport->dev.bus_id, vport->shost->host_no, dev_name(&vport->dev), vport->shost->host_no,
vport->channel, stat); vport->channel, stat);
} }

11
drivers/scsi/scsi_transport_iscsi.c
View File

@ -187,8 +187,7 @@ iscsi_create_endpoint(int dd_size)
ep->id = id; ep->id = id;
ep->dev.class = &iscsi_endpoint_class; ep->dev.class = &iscsi_endpoint_class;
snprintf(ep->dev.bus_id, BUS_ID_SIZE, "ep-%llu", dev_set_name(&ep->dev, "ep-%llu", (unsigned long long) id);
(unsigned long long) id);
err = device_register(&ep->dev); err = device_register(&ep->dev);
if (err) if (err)
goto free_ep; goto free_ep;
@ -724,8 +723,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
} }
session->target_id = id; session->target_id = id;
snprintf(session->dev.bus_id, BUS_ID_SIZE, "session%u", dev_set_name(&session->dev, "session%u", session->sid);
session->sid);
err = device_add(&session->dev); err = device_add(&session->dev);
if (err) { if (err) {
iscsi_cls_session_printk(KERN_ERR, session, iscsi_cls_session_printk(KERN_ERR, session,
@ -898,8 +896,7 @@ iscsi_create_conn(struct iscsi_cls_session *session, int dd_size, uint32_t cid)
if (!get_device(&session->dev)) if (!get_device(&session->dev))
goto free_conn; goto free_conn;
snprintf(conn->dev.bus_id, BUS_ID_SIZE, "connection%d:%u", dev_set_name(&conn->dev, "connection%d:%u", session->sid, cid);
session->sid, cid);
conn->dev.parent = &session->dev; conn->dev.parent = &session->dev;
conn->dev.release = iscsi_conn_release; conn->dev.release = iscsi_conn_release;
err = device_register(&conn->dev); err = device_register(&conn->dev);
@ -1816,7 +1813,7 @@ iscsi_register_transport(struct iscsi_transport *tt)
priv->t.create_work_queue = 1; priv->t.create_work_queue = 1;
priv->dev.class = &iscsi_transport_class; priv->dev.class = &iscsi_transport_class;
snprintf(priv->dev.bus_id, BUS_ID_SIZE, "%s", tt->name); dev_set_name(&priv->dev, "%s", tt->name);
err = device_register(&priv->dev); err = device_register(&priv->dev);
if (err) if (err)
goto free_priv; goto free_priv;

42
drivers/scsi/scsi_transport_sas.c
View File

@ -207,7 +207,7 @@ static int sas_bsg_initialize(struct Scsi_Host *shost, struct sas_rphy *rphy)
struct request_queue *q; struct request_queue *q;
int error; int error;
struct device *dev; struct device *dev;
char namebuf[BUS_ID_SIZE]; char namebuf[20];
const char *name; const char *name;
void (*release)(struct device *); void (*release)(struct device *);
@ -219,7 +219,7 @@ static int sas_bsg_initialize(struct Scsi_Host *shost, struct sas_rphy *rphy)
if (rphy) { if (rphy) {
q = blk_init_queue(sas_non_host_smp_request, NULL); q = blk_init_queue(sas_non_host_smp_request, NULL);
dev = &rphy->dev; dev = &rphy->dev;
name = dev->bus_id; name = dev_name(dev);
release = NULL; release = NULL;
} else { } else {
q = blk_init_queue(sas_host_smp_request, NULL); 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); INIT_LIST_HEAD(&phy->port_siblings);
if (scsi_is_sas_expander_device(parent)) { if (scsi_is_sas_expander_device(parent)) {
struct sas_rphy *rphy = dev_to_rphy(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); rphy->scsi_target_id, number);
} else } 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; int res;
res = sysfs_create_link(&port->dev.kobj, &phy->dev.kobj, res = sysfs_create_link(&port->dev.kobj, &phy->dev.kobj,
phy->dev.bus_id); dev_name(&phy->dev));
if (res) if (res)
goto err; goto err;
res = sysfs_create_link(&phy->dev.kobj, &port->dev.kobj, "port"); 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, static void sas_port_delete_link(struct sas_port *port,
struct sas_phy *phy) 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)) { if (scsi_is_sas_expander_device(parent)) {
struct sas_rphy *rphy = dev_to_rphy(parent); struct sas_rphy *rphy = dev_to_rphy(parent);
sprintf(port->dev.bus_id, "port-%d:%d:%d", shost->host_no, dev_set_name(&port->dev, "port-%d:%d:%d", shost->host_no,
rphy->scsi_target_id, port->port_identifier); rphy->scsi_target_id, port->port_identifier);
} else } else
sprintf(port->dev.bus_id, "port-%d:%d", shost->host_no, dev_set_name(&port->dev, "port-%d:%d", shost->host_no,
port->port_identifier); 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) { if (port->is_backlink) {
struct device *parent = port->dev.parent; 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 /* If this trips, you added a phy that was already
* part of a different port */ * part of a different port */
if (unlikely(tmp != phy)) { 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(); BUG();
} }
} else { } else {
@ -1023,7 +1024,7 @@ void sas_port_mark_backlink(struct sas_port *port)
return; return;
port->is_backlink = 1; port->is_backlink = 1;
res = sysfs_create_link(&port->dev.kobj, &parent->kobj, res = sysfs_create_link(&port->dev.kobj, &parent->kobj,
parent->bus_id); dev_name(parent));
if (res) if (res)
goto err; goto err;
return; return;
@ -1367,11 +1368,12 @@ struct sas_rphy *sas_end_device_alloc(struct sas_port *parent)
rdev->rphy.dev.release = sas_end_device_release; rdev->rphy.dev.release = sas_end_device_release;
if (scsi_is_sas_expander_device(parent->dev.parent)) { if (scsi_is_sas_expander_device(parent->dev.parent)) {
struct sas_rphy *rphy = dev_to_rphy(parent->dev.parent); struct sas_rphy *rphy = dev_to_rphy(parent->dev.parent);
sprintf(rdev->rphy.dev.bus_id, "end_device-%d:%d:%d", dev_set_name(&rdev->rphy.dev, "end_device-%d:%d:%d",
shost->host_no, rphy->scsi_target_id, parent->port_identifier); shost->host_no, rphy->scsi_target_id,
parent->port_identifier);
} else } else
sprintf(rdev->rphy.dev.bus_id, "end_device-%d:%d", dev_set_name(&rdev->rphy.dev, "end_device-%d:%d",
shost->host_no, parent->port_identifier); shost->host_no, parent->port_identifier);
rdev->rphy.identify.device_type = SAS_END_DEVICE; rdev->rphy.identify.device_type = SAS_END_DEVICE;
sas_rphy_initialize(&rdev->rphy); sas_rphy_initialize(&rdev->rphy);
transport_setup_device(&rdev->rphy.dev); 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); mutex_lock(&sas_host->lock);
rdev->rphy.scsi_target_id = sas_host->next_expander_id++; rdev->rphy.scsi_target_id = sas_host->next_expander_id++;
mutex_unlock(&sas_host->lock); mutex_unlock(&sas_host->lock);
sprintf(rdev->rphy.dev.bus_id, "expander-%d:%d", dev_set_name(&rdev->rphy.dev, "expander-%d:%d",
shost->host_no, rdev->rphy.scsi_target_id); shost->host_no, rdev->rphy.scsi_target_id);
rdev->rphy.identify.device_type = type; rdev->rphy.identify.device_type = type;
sas_rphy_initialize(&rdev->rphy); sas_rphy_initialize(&rdev->rphy);
transport_setup_device(&rdev->rphy.dev); transport_setup_device(&rdev->rphy.dev);
@ -1445,7 +1447,7 @@ int sas_rphy_add(struct sas_rphy *rphy)
transport_add_device(&rphy->dev); transport_add_device(&rphy->dev);
transport_configure_device(&rphy->dev); transport_configure_device(&rphy->dev);
if (sas_bsg_initialize(shost, rphy)) 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);

2
drivers/scsi/scsi_transport_srp.c
View File

@ -212,7 +212,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
rport->roles = ids->roles; rport->roles = ids->roles;
id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id); id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
sprintf(rport->dev.bus_id, "port-%d:%d", shost->host_no, id); dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
transport_setup_device(&rport->dev); transport_setup_device(&rport->dev);

2
drivers/scsi/sd.c
View File

@ -1876,7 +1876,7 @@ static int sd_probe(struct device *dev)
device_initialize(&sdkp->dev); device_initialize(&sdkp->dev);
sdkp->dev.parent = &sdp->sdev_gendev; sdkp->dev.parent = &sdp->sdev_gendev;
sdkp->dev.class = &sd_disk_class; sdkp->dev.class = &sd_disk_class;
strncpy(sdkp->dev.bus_id, sdp->sdev_gendev.bus_id, BUS_ID_SIZE); dev_set_name(&sdkp->dev, dev_name(&sdp->sdev_gendev));
if (device_add(&sdkp->dev)) if (device_add(&sdkp->dev))
goto out_free_index; goto out_free_index;

2
drivers/scsi/ses.c
View File

@ -526,7 +526,7 @@ static int ses_intf_add(struct device *cdev,
if (!scomp) if (!scomp)
goto err_free; goto err_free;
edev = enclosure_register(cdev->parent, sdev->sdev_gendev.bus_id, edev = enclosure_register(cdev->parent, dev_name(&sdev->sdev_gendev),
components, &ses_enclosure_callbacks); components, &ses_enclosure_callbacks);
if (IS_ERR(edev)) { if (IS_ERR(edev)) {
err = PTR_ERR(edev); err = PTR_ERR(edev);

4
drivers/scsi/sim710.c
View File

@ -102,7 +102,7 @@ sim710_probe_common(struct device *dev, unsigned long base_addr,
struct NCR_700_Host_Parameters *hostdata = struct NCR_700_Host_Parameters *hostdata =
kzalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL); kzalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
printk(KERN_NOTICE "sim710: %s\n", dev->bus_id); printk(KERN_NOTICE "sim710: %s\n", dev_name(dev));
printk(KERN_NOTICE "sim710: irq = %d, clock = %d, base = 0x%lx, scsi_id = %d\n", printk(KERN_NOTICE "sim710: irq = %d, clock = %d, base = 0x%lx, scsi_id = %d\n",
irq, clock, base_addr, scsi_id); irq, clock, base_addr, scsi_id);
@ -305,7 +305,7 @@ sim710_eisa_probe(struct device *dev)
scsi_id = ffs(val) - 1; scsi_id = ffs(val) - 1;
if(scsi_id > 7 || (val & ~(1<<scsi_id)) != 0) { if(scsi_id > 7 || (val & ~(1<<scsi_id)) != 0) {
printk(KERN_ERR "sim710.c, EISA card %s has incorrect scsi_id, setting to 7\n", dev->bus_id); printk(KERN_ERR "sim710.c, EISA card %s has incorrect scsi_id, setting to 7\n", dev_name(dev));
scsi_id = 7; scsi_id = 7;
} }
} else { } else {

3
drivers/scsi/sni_53c710.c
View File

@ -78,8 +78,7 @@ static int __init snirm710_probe(struct platform_device *dev)
base = res->start; base = res->start;
hostdata = kzalloc(sizeof(*hostdata), GFP_KERNEL); hostdata = kzalloc(sizeof(*hostdata), GFP_KERNEL);
if (!hostdata) { if (!hostdata) {
printk(KERN_ERR "%s: Failed to allocate host data\n", dev_printk(KERN_ERR, dev, "Failed to allocate host data\n");
dev->dev.bus_id);
return -ENOMEM; return -ENOMEM;
} }

4
drivers/scsi/zalon.c
View File

@ -137,8 +137,8 @@ zalon_probe(struct parisc_device *dev)
goto fail; goto fail;
if (request_irq(dev->irq, ncr53c8xx_intr, IRQF_SHARED, "zalon", host)) { if (request_irq(dev->irq, ncr53c8xx_intr, IRQF_SHARED, "zalon", host)) {
printk(KERN_ERR "%s: irq problem with %d, detaching\n ", dev_printk(KERN_ERR, dev, "irq problem with %d, detaching\n ",
dev->dev.bus_id, dev->irq); dev->irq);
goto fail; goto fail;
} }