Commit f28701cc authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: dvbdev: fix most coding style issues 



As we're doing several changes here, address coding style issues,
as reported by checkpatch.pl.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 280a8ab8

drivers/media/dvb-core/dvbdev.c

+74 −83
Original line number Diff line number Diff line
@@ -112,9 +112,7 @@ static int dvb_device_open(struct inode *inode, struct file *file) 
	return -ENODEV;

}





static const struct file_operations dvb_device_fops =

{

static const struct file_operations dvb_device_fops = {

	.owner =	THIS_MODULE,

	.open =		dvb_device_open,

	.llseek =	noop_llseek,
@@ -147,7 +145,6 @@ int dvb_generic_open(struct inode *inode, struct file *file) 
}

EXPORT_SYMBOL(dvb_generic_open);





int dvb_generic_release(struct inode *inode, struct file *file)

{

	struct dvb_device *dvbdev = file->private_data;
@@ -155,11 +152,10 @@ int dvb_generic_release(struct inode *inode, struct file *file) 
	if (!dvbdev)

		return -ENODEV;



	if ((file->f_flags & O_ACCMODE) == O_RDONLY) {

	if ((file->f_flags & O_ACCMODE) == O_RDONLY)

		dvbdev->readers++;

	} else {

	else

		dvbdev->writers++;

	}



	dvbdev->users++;
@@ -169,7 +165,6 @@ int dvb_generic_release(struct inode *inode, struct file *file) 
}

EXPORT_SYMBOL(dvb_generic_release);





long dvb_generic_ioctl(struct file *file,

		       unsigned int cmd, unsigned long arg)

{
@@ -185,13 +180,13 @@ long dvb_generic_ioctl(struct file *file, 
}

EXPORT_SYMBOL(dvb_generic_ioctl);





static int dvbdev_get_free_id(struct dvb_adapter *adap, int type)

{

	u32 id = 0;



	while (id < DVB_MAX_IDS) {

		struct dvb_device *dev;



		list_for_each_entry(dev, &adap->device_list, list_head)

			if (dev->type == type && dev->id == id)

				goto skip;
@@ -387,7 +382,7 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev, 


static int dvb_register_media_device(struct dvb_device *dvbdev,

				     int type, int minor,

				     unsigned demux_sink_pads)

				     unsigned int demux_sink_pads)

{

#if defined(CONFIG_MEDIA_CONTROLLER_DVB)

	struct media_link *link;
@@ -462,7 +457,8 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, 


	mutex_lock(&dvbdev_register_lock);



	if ((id = dvbdev_get_free_id (adap, type)) < 0) {

	id = dvbdev_get_free_id(adap, type);

	if (id < 0) {

		mutex_unlock(&dvbdev_register_lock);

		*pdvbdev = NULL;

		pr_err("%s: couldn't find free device id\n", __func__);
@@ -482,14 +478,13 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, 
	 */

	list_for_each_entry(node, &dvbdevfops_list, list_head) {

		if (node->fops->owner == adap->module &&

				node->type == type &&

				node->template == template) {

		    node->type == type && node->template == template) {

			dvbdevfops = node->fops;

			break;

		}

	}



	if (dvbdevfops == NULL) {

	if (!dvbdevfops) {

		dvbdevfops = kmemdup(template->fops, sizeof(*dvbdevfops), GFP_KERNEL);

		if (!dvbdevfops) {

			kfree(dvbdev);
@@ -497,7 +492,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, 
			return -ENOMEM;

		}



		new_node = kzalloc(sizeof(struct dvbdevfops_node), GFP_KERNEL);

		new_node = kzalloc(sizeof(*new_node), GFP_KERNEL);

		if (!new_node) {

			kfree(dvbdevfops);

			kfree(dvbdev);
@@ -524,7 +519,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, 
	down_write(&minor_rwsem);

#ifdef CONFIG_DVB_DYNAMIC_MINORS

	for (minor = 0; minor < MAX_DVB_MINORS; minor++)

		if (dvb_minors[minor] == NULL)

		if (!dvb_minors[minor])

			break;

	if (minor == MAX_DVB_MINORS) {

		if (new_node) {
@@ -586,7 +581,6 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, 
}

EXPORT_SYMBOL(dvb_register_device);





void dvb_remove_device(struct dvb_device *dvbdev)

{

	if (!dvbdev)
@@ -605,7 +599,6 @@ void dvb_remove_device(struct dvb_device *dvbdev) 
}

EXPORT_SYMBOL(dvb_remove_device);





static void dvb_free_device(struct kref *ref)

{

	struct dvb_device *dvbdev = container_of(ref, struct dvb_device, ref);
@@ -613,7 +606,6 @@ static void dvb_free_device(struct kref *ref) 
	kfree(dvbdev);

}





struct dvb_device *dvb_device_get(struct dvb_device *dvbdev)

{

	kref_get(&dvbdev->ref);
@@ -621,14 +613,12 @@ struct dvb_device *dvb_device_get(struct dvb_device *dvbdev) 
}

EXPORT_SYMBOL(dvb_device_get);





void dvb_device_put(struct dvb_device *dvbdev)

{

	if (dvbdev)

		kref_put(&dvbdev->ref, dvb_free_device);

}





void dvb_unregister_device(struct dvb_device *dvbdev)

{

	dvb_remove_device(dvbdev);
@@ -636,7 +626,6 @@ void dvb_unregister_device(struct dvb_device *dvbdev) 
}

EXPORT_SYMBOL(dvb_unregister_device);





#ifdef CONFIG_MEDIA_CONTROLLER_DVB



static int dvb_create_io_intf_links(struct dvb_adapter *adap,
@@ -669,9 +658,9 @@ int dvb_create_media_graph(struct dvb_adapter *adap, 
	struct media_entity *demux = NULL, *ca = NULL;

	struct media_link *link;

	struct media_interface *intf;

	unsigned demux_pad = 0;

	unsigned dvr_pad = 0;

	unsigned ntuner = 0, ndemod = 0;

	unsigned int demux_pad = 0;

	unsigned int dvr_pad = 0;

	unsigned int ntuner = 0, ndemod = 0;

	int ret, pad_source, pad_sink;

	static const char *connector_name = "Television";
@@ -864,8 +853,10 @@ EXPORT_SYMBOL_GPL(dvb_create_media_graph); 
static int dvbdev_check_free_adapter_num(int num)

{

	struct list_head *entry;



	list_for_each(entry, &dvb_adapter_list) {

		struct dvb_adapter *adap;



		adap = list_entry(entry, struct dvb_adapter, list_head);

		if (adap->num == num)

			return 0;
@@ -886,7 +877,6 @@ static int dvbdev_get_free_adapter_num (void) 
	return -ENFILE;

}





int dvb_register_adapter(struct dvb_adapter *adap, const char *name,

			 struct module *module, struct device *device,

			 short *adapter_nums)
@@ -938,7 +928,6 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, 
}

EXPORT_SYMBOL(dvb_register_adapter);





int dvb_unregister_adapter(struct dvb_adapter *adap)

{

	mutex_lock(&dvbdev_register_lock);
@@ -948,11 +937,13 @@ int dvb_unregister_adapter(struct dvb_adapter *adap) 
}

EXPORT_SYMBOL(dvb_unregister_adapter);



/* if the miracle happens and "generic_usercopy()" is included into

   the kernel, then this can vanish. please don't make the mistake and

   define this as video_usercopy(). this will introduce a dependency

   to the v4l "videodev.o" module, which is unnecessary for some

   cards (ie. the budget dvb-cards don't need the v4l module...) */

/*

 * if the miracle happens and "generic_usercopy()" is included into

 * the kernel, then this can vanish. please don't make the mistake and

 * define this as video_usercopy(). this will introduce a dependency

 * to the v4l "videodev.o" module, which is unnecessary for some

 * cards (ie. the budget dvb-cards don't need the v4l module...)

 */

int dvb_usercopy(struct file *file,

		 unsigned int cmd, unsigned long arg,

		 int (*func)(struct file *file,
@@ -980,7 +971,7 @@ int dvb_usercopy(struct file *file, 
		} else {

			/* too big to allocate from stack */

			mbuf = kmalloc(_IOC_SIZE(cmd), GFP_KERNEL);

			if (NULL == mbuf)

			if (!mbuf)

				return -ENOMEM;

			parg = mbuf;

		}
@@ -992,15 +983,15 @@ int dvb_usercopy(struct file *file, 
	}



	/* call driver */

	if ((err = func(file, cmd, parg)) == -ENOIOCTLCMD)

	err = func(file, cmd, parg);

	if (err == -ENOIOCTLCMD)

		err = -ENOTTY;



	if (err < 0)

		goto out;



	/*  Copy results into user buffer  */

	switch (_IOC_DIR(cmd))

	{

	switch (_IOC_DIR(cmd)) {

	case _IOC_READ:

	case (_IOC_WRITE | _IOC_READ):

		if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
@@ -1080,19 +1071,20 @@ static char *dvb_devnode(const struct device *dev, umode_t *mode) 
		dvbdev->adapter->num, dnames[dvbdev->type], dvbdev->id);

}





static int __init init_dvbdev(void)

{

	int retval;

	dev_t dev = MKDEV(DVB_MAJOR, 0);



	if ((retval = register_chrdev_region(dev, MAX_DVB_MINORS, "DVB")) != 0) {

	retval = register_chrdev_region(dev, MAX_DVB_MINORS, "DVB");

	if (retval != 0) {

		pr_err("dvb-core: unable to get major %d\n", DVB_MAJOR);

		return retval;

	}



	cdev_init(&dvb_device_cdev, &dvb_device_fops);

	if ((retval = cdev_add(&dvb_device_cdev, dev, MAX_DVB_MINORS)) != 0) {

	retval = cdev_add(&dvb_device_cdev, dev, MAX_DVB_MINORS);

	if (retval != 0) {

		pr_err("dvb-core: unable register character device\n");

		goto error;

	}
@@ -1112,7 +1104,6 @@ static int __init init_dvbdev(void) 
	return retval;

}





static void __exit exit_dvbdev(void)

{

	struct dvbdevfops_node *node, *next;