提交 c64d472a 编写于 作者: J Jens-Michael Hoffmann 提交者: Jody McIntyre

ieee1394/raw1394: LIndent fixes

This patch contains fixes by LIndent.
Signed-off-by: NJens-Michael Hoffmann <jensmh@gmx.de>
Signed-off-by: NJody McIntyre <scjody@modernduck.com>
上级 066ef9c2
...@@ -2482,8 +2482,8 @@ static int raw1394_iso_recv_packets(struct file_info *fi, void __user * uaddr) ...@@ -2482,8 +2482,8 @@ static int raw1394_iso_recv_packets(struct file_info *fi, void __user * uaddr)
/* ensure user-supplied buffer is accessible and big enough */ /* ensure user-supplied buffer is accessible and big enough */
if (!access_ok(VERIFY_WRITE, upackets.infos, if (!access_ok(VERIFY_WRITE, upackets.infos,
upackets.n_packets * upackets.n_packets *
sizeof(struct raw1394_iso_packet_info))) sizeof(struct raw1394_iso_packet_info)))
return -EFAULT; return -EFAULT;
/* copy the packet_infos out */ /* copy the packet_infos out */
...@@ -2516,8 +2516,8 @@ static int raw1394_iso_send_packets(struct file_info *fi, void __user * uaddr) ...@@ -2516,8 +2516,8 @@ static int raw1394_iso_send_packets(struct file_info *fi, void __user * uaddr)
/* ensure user-supplied buffer is accessible and big enough */ /* ensure user-supplied buffer is accessible and big enough */
if (!access_ok(VERIFY_READ, upackets.infos, if (!access_ok(VERIFY_READ, upackets.infos,
upackets.n_packets * upackets.n_packets *
sizeof(struct raw1394_iso_packet_info))) sizeof(struct raw1394_iso_packet_info)))
return -EFAULT; return -EFAULT;
/* copy the infos structs in and queue the packets */ /* copy the infos structs in and queue the packets */
...@@ -2741,8 +2741,7 @@ static int raw1394_release(struct inode *inode, struct file *file) ...@@ -2741,8 +2741,7 @@ static int raw1394_release(struct inode *inode, struct file *file)
list) { list) {
entry = fi_hlp->addr_list.next; entry = fi_hlp->addr_list.next;
while (entry != &(fi_hlp->addr_list)) { while (entry != &(fi_hlp->addr_list)) {
arm_addr = list_entry(entry, arm_addr = list_entry(entry, struct
struct
arm_addr, arm_addr,
addr_list); addr_list);
if (arm_addr->start == if (arm_addr->start ==
...@@ -2905,16 +2904,17 @@ static int __init init_raw1394(void) ...@@ -2905,16 +2904,17 @@ static int __init init_raw1394(void)
hpsb_register_highlevel(&raw1394_highlevel); hpsb_register_highlevel(&raw1394_highlevel);
if (IS_ERR(class_device_create(hpsb_protocol_class, NULL, MKDEV( if (IS_ERR
IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16), (class_device_create
NULL, RAW1394_DEVICE_NAME))) { (hpsb_protocol_class, NULL,
MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16), NULL,
RAW1394_DEVICE_NAME))) {
ret = -EFAULT; ret = -EFAULT;
goto out_unreg; goto out_unreg;
} }
devfs_mk_cdev(MKDEV( devfs_mk_cdev(MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16),
IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16), S_IFCHR | S_IRUSR | S_IWUSR, RAW1394_DEVICE_NAME);
S_IFCHR | S_IRUSR | S_IWUSR, RAW1394_DEVICE_NAME);
cdev_init(&raw1394_cdev, &raw1394_fops); cdev_init(&raw1394_cdev, &raw1394_fops);
raw1394_cdev.owner = THIS_MODULE; raw1394_cdev.owner = THIS_MODULE;
...@@ -2936,20 +2936,22 @@ static int __init init_raw1394(void) ...@@ -2936,20 +2936,22 @@ static int __init init_raw1394(void)
goto out; goto out;
out_dev: out_dev:
devfs_remove(RAW1394_DEVICE_NAME); devfs_remove(RAW1394_DEVICE_NAME);
class_device_destroy(hpsb_protocol_class, class_device_destroy(hpsb_protocol_class,
MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)); MKDEV(IEEE1394_MAJOR,
out_unreg: IEEE1394_MINOR_BLOCK_RAW1394 * 16));
out_unreg:
hpsb_unregister_highlevel(&raw1394_highlevel); hpsb_unregister_highlevel(&raw1394_highlevel);
out: out:
return ret; return ret;
} }
static void __exit cleanup_raw1394(void) static void __exit cleanup_raw1394(void)
{ {
class_device_destroy(hpsb_protocol_class, class_device_destroy(hpsb_protocol_class,
MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)); MKDEV(IEEE1394_MAJOR,
IEEE1394_MINOR_BLOCK_RAW1394 * 16));
cdev_del(&raw1394_cdev); cdev_del(&raw1394_cdev);
devfs_remove(RAW1394_DEVICE_NAME); devfs_remove(RAW1394_DEVICE_NAME);
hpsb_unregister_highlevel(&raw1394_highlevel); hpsb_unregister_highlevel(&raw1394_highlevel);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册