mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
block: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: Jens Axboe <[email protected]> Signed-off-by: Kay Sievers <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
4383fc3d9a
commit
3ada8b7e98
3 changed files with 7 additions and 12 deletions
|
|
@ -42,7 +42,7 @@ struct bsg_device {
|
|||
int done_cmds;
|
||||
wait_queue_head_t wq_done;
|
||||
wait_queue_head_t wq_free;
|
||||
char name[BUS_ID_SIZE];
|
||||
char name[20];
|
||||
int max_queue;
|
||||
unsigned long flags;
|
||||
};
|
||||
|
|
@ -781,7 +781,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
|
|||
mutex_lock(&bsg_mutex);
|
||||
hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));
|
||||
|
||||
strncpy(bd->name, rq->bsg_dev.class_dev->bus_id, sizeof(bd->name) - 1);
|
||||
strncpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name) - 1);
|
||||
dprintk("bound to <%s>, max queue %d\n",
|
||||
format_dev_t(buf, inode->i_rdev), bd->max_queue);
|
||||
|
||||
|
|
@ -992,7 +992,7 @@ int bsg_register_queue(struct request_queue *q, struct device *parent,
|
|||
if (name)
|
||||
devname = name;
|
||||
else
|
||||
devname = parent->bus_id;
|
||||
devname = dev_name(parent);
|
||||
|
||||
/*
|
||||
* we need a proper transport to send commands, not a stacked device
|
||||
|
|
|
|||
Loading…
Reference in a new issue