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

Commit 9d5164da authored by Roel Van Nyen's avatar Roel Van Nyen Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: tm6000: fix coding style issues of tm6000-cards.c 



fix coding style issues

[mchehab@redhat.com: Fix conflicts with other patches]
Signed-off-by: default avatarRoel Van Nyen <roel.vannyen@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e18f58c6

drivers/staging/tm6000/tm6000-cards.c

+58 −62
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ int tm6000_tuner_callback(void *ptr, int component, int command, int arg) 
			break;

		}

	}

	return (rc);

	return rc;

}



int tm6000_cards_setup(struct tm6000_core *dev)
@@ -668,7 +668,7 @@ static void get_max_endpoint(struct usb_device *udev, 
		tm_ep->bInterfaceNumber = alt->desc.bInterfaceNumber;

		tm_ep->bAlternateSetting = alt->desc.bAlternateSetting;



		printk("tm6000: %s endpoint: 0x%02x (max size=%u bytes)\n",

		printk(KERN_INFO "tm6000: %s endpoint: 0x%02x (max size=%u bytes)\n",

					msgtype, curr_e->desc.bEndpointAddress,

					size);

	}
@@ -687,7 +687,6 @@ static int tm6000_usb_probe(struct usb_interface *interface, 
	int nr = 0;

	char *speed;





	usbdev = usb_get_dev(interface_to_usbdev(interface));



	/* Selects the proper interface */
@@ -698,7 +697,7 @@ static int tm6000_usb_probe(struct usb_interface *interface, 
	/* Check to see next free device and mark as used */

	nr = find_first_zero_bit(&tm6000_devused, TM6000_MAXBOARDS);

	if (nr >= TM6000_MAXBOARDS) {

		printk ("tm6000: Supports only %i tm60xx boards.\n",TM6000_MAXBOARDS);

		printk(KERN_ERR "tm6000: Supports only %i tm60xx boards.\n", TM6000_MAXBOARDS);

		usb_put_dev(usbdev);

		return -ENOMEM;

	}
@@ -706,7 +705,7 @@ static int tm6000_usb_probe(struct usb_interface *interface, 
	/* Create and initialize dev struct */

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

	if (dev == NULL) {

		printk ("tm6000" ": out of memory!\n");

		printk(KERN_ERR "tm6000" ": out of memory!\n");

		usb_put_dev(usbdev);

		return -ENOMEM;

	}
@@ -717,9 +716,8 @@ static int tm6000_usb_probe(struct usb_interface *interface, 
	snprintf(dev->name, 29, "tm6000 #%d", nr);



	dev->model = id->driver_info;

	if ((card[nr]>=0) && (card[nr]<ARRAY_SIZE(tm6000_boards))) {

	if ((card[nr] >= 0) && (card[nr] < ARRAY_SIZE(tm6000_boards)))

		dev->model = card[nr];

	}



	INIT_LIST_HEAD(&dev->tm6000_corelist);

	dev->udev = usbdev;
@@ -755,7 +753,7 @@ static int tm6000_usb_probe(struct usb_interface *interface, 
			dir_out = ((e->desc.bEndpointAddress &

					USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT);



			printk("tm6000: alt %d, interface %i, class %i\n",

			printk(KERN_INFO "tm6000: alt %d, interface %i, class %i\n",

			       i,

			       interface->altsetting[i].desc.bInterfaceNumber,

			       interface->altsetting[i].desc.bInterfaceClass);
@@ -792,7 +790,7 @@ static int tm6000_usb_probe(struct usb_interface *interface, 
	}





	printk("tm6000: New video device @ %s Mbps (%04x:%04x, ifnum %d)\n",

	printk(KERN_INFO "tm6000: New video device @ %s Mbps (%04x:%04x, ifnum %d)\n",

		speed,

		le16_to_cpu(dev->udev->descriptor.idVendor),

		le16_to_cpu(dev->udev->descriptor.idProduct),
@@ -800,7 +798,7 @@ static int tm6000_usb_probe(struct usb_interface *interface, 


/* check if the the device has the iso in endpoint at the correct place */

	if (!dev->isoc_in.endp) {

		printk("tm6000: probing error: no IN ISOC endpoint!\n");

		printk(KERN_ERR "tm6000: probing error: no IN ISOC endpoint!\n");

		rc = -ENODEV;



		goto err;
@@ -809,7 +807,7 @@ static int tm6000_usb_probe(struct usb_interface *interface, 
	/* save our data pointer in this interface device */

	usb_set_intfdata(interface, dev);



	printk("tm6000: Found %s\n", tm6000_boards[dev->model].name);

	printk(KERN_INFO "tm6000: Found %s\n", tm6000_boards[dev->model].name);



	rc = tm6000_init_dev(dev);
@@ -819,7 +817,7 @@ static int tm6000_usb_probe(struct usb_interface *interface, 
	return 0;



err:

	printk("tm6000: Error %d while registering\n", rc);

	printk(KERN_ERR "tm6000: Error %d while registering\n", rc);



	tm6000_devused &= ~(1<<nr);

	usb_put_dev(usbdev);
@@ -841,7 +839,7 @@ static void tm6000_usb_disconnect(struct usb_interface *interface) 
	if (!dev)

		return;



	printk("tm6000: disconnecting %s\n", dev->name);

	printk(KERN_INFO "tm6000: disconnecting %s\n", dev->name);



	mutex_lock(&dev->lock);
@@ -858,8 +856,6 @@ static void tm6000_usb_disconnect(struct usb_interface *interface) 


	v4l2_device_unregister(&dev->v4l2_dev);



//	wake_up_interruptible_all(&dev->open);



	dev->state |= DEV_DISCONNECTED;



	usb_put_dev(dev->udev);
@@ -886,7 +882,7 @@ static int __init tm6000_module_init(void) 
	/* register this driver with the USB subsystem */

	result = usb_register(&tm6000_usb_driver);

	if (result)

		printk("tm6000"

		printk(KERN_ERR "tm6000"

			   " usb_register failed. Error number %d.\n", result);



	return result;