Commit 438b693d authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman

[PATCH] raw.c cleanups

- pass the raw_config_request by reference, not by value.

- fix whitespace drainbamage
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 3e13e3b2
...@@ -125,11 +125,11 @@ raw_ioctl(struct inode *inode, struct file *filp, ...@@ -125,11 +125,11 @@ raw_ioctl(struct inode *inode, struct file *filp,
return ioctl_by_bdev(bdev, command, arg); return ioctl_by_bdev(bdev, command, arg);
} }
static void bind_device(struct raw_config_request rq) static void bind_device(struct raw_config_request *rq)
{ {
class_simple_device_remove(MKDEV(RAW_MAJOR, rq.raw_minor)); class_simple_device_remove(MKDEV(RAW_MAJOR, rq->raw_minor));
class_simple_device_add(raw_class, MKDEV(RAW_MAJOR, rq.raw_minor), class_simple_device_add(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor),
NULL, "raw%d", rq.raw_minor); NULL, "raw%d", rq->raw_minor);
} }
/* /*
...@@ -200,15 +200,16 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp, ...@@ -200,15 +200,16 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp,
if (rq.block_major == 0 && rq.block_minor == 0) { if (rq.block_major == 0 && rq.block_minor == 0) {
/* unbind */ /* unbind */
rawdev->binding = NULL; rawdev->binding = NULL;
class_simple_device_remove(MKDEV(RAW_MAJOR, rq.raw_minor)); class_simple_device_remove(MKDEV(RAW_MAJOR,
rq.raw_minor));
} else { } else {
rawdev->binding = bdget(dev); rawdev->binding = bdget(dev);
if (rawdev->binding == NULL) if (rawdev->binding == NULL)
err = -ENOMEM; err = -ENOMEM;
else { else {
__module_get(THIS_MODULE); __module_get(THIS_MODULE);
bind_device(rq); bind_device(&rq);
} }
} }
up(&raw_mutex); up(&raw_mutex);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment