Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45f9f018 authored by Nanakos Chrysostomos's avatar Nanakos Chrysostomos Committed by Greg Kroah-Hartman
Browse files

Staging: vme: devices: vme_user.c: Fix checkpatch.pl issues. 



Fix resolves checkpatch.pl issues for vme_user.c file.

Signed-off-by: default avatarNanakos Chrysostomos <nanakos@wired-net.gr>
Signed-off-by: default avatarMartyn Welch <martyn.welch@ge.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e3613299

drivers/staging/vme/devices/vme_user.c

+45 −47
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
#include <linux/smp_lock.h>

#include <linux/types.h>



#include <asm/io.h>

#include <asm/uaccess.h>

#include <linux/io.h>

#include <linux/uaccess.h>



#include "../vme.h"

#include "vme_user.h"
@@ -216,21 +216,20 @@ static ssize_t resource_to_user(int minor, char __user *buf, size_t count, 
		/* We copy to kernel buffer */

		copied = vme_master_read(image[minor].resource,

			image[minor].kern_buf, count, *ppos);

		if (copied < 0) {

		if (copied < 0)

			return (int)copied;

		}



		retval = __copy_to_user(buf, image[minor].kern_buf,

			(unsigned long)copied);

		if (retval != 0) {

			copied = (copied - retval);

			printk("User copy failed\n");

			printk(KERN_INFO "User copy failed\n");

			return -EINVAL;

		}



	} else {

		/* XXX Need to write this */

		printk("Currently don't support large transfers\n");

		printk(KERN_INFO "Currently don't support large transfers\n");

		/* Map in pages from userspace */



		/* Call vme_master_read to do the transfer */
@@ -264,7 +263,7 @@ static ssize_t resource_from_user(unsigned int minor, const char *buf, 
			image[minor].kern_buf, copied, *ppos);

	} else {

		/* XXX Need to write this */

		printk("Currently don't support large transfers\n");

		printk(KERN_INFO "Currently don't support large transfers\n");

		/* Map in pages from userspace */



		/* Call vme_master_write to do the transfer */
@@ -792,7 +791,7 @@ static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot) 
				MKDEV(VME_MAJOR, i), NULL, name,

				(type[i] == SLAVE_MINOR) ? i - (MASTER_MAX + 1) : i);

		if (IS_ERR(image[i].device)) {

			printk("%s: Error creating sysfs device\n",

			printk(KERN_INFO "%s: Error creating sysfs device\n",

				driver_name);

			err = PTR_ERR(image[i].device);

			goto err_sysfs;
@@ -845,9 +844,8 @@ static int __exit vme_user_remove(struct device *dev, int cur_bus, int cur_slot) 
	int i;



	/* Remove sysfs Entries */

	for(i=0; i<VME_DEVS; i++) {

	for (i = 0; i < VME_DEVS; i++)

		device_destroy(vme_user_sysfs_class, MKDEV(VME_MAJOR, i));

	}

	class_destroy(vme_user_sysfs_class);



	for (i = MASTER_MINOR; i < (MASTER_MAX + 1); i++)