- repair whitespace and newline damage

- convert remaining printk()s to dprintk()s

1 files changed, 26 insertions, 59 deletions

diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
index 32f7800fa..57a15118c 100644
--- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -65,7 +65,6 @@ do {									\
 		printk(args); }						\
 } while (0)
 
-
 enum cinergyt2_ep1_cmd {
 	CINERGYT2_EP1_PID_TABLE_RESET		= 0x01,
 	CINERGYT2_EP1_PID_SETUP			= 0x02,
@@ -78,7 +77,6 @@ enum cinergyt2_ep1_cmd {
 	CINERGYT2_EP1_SLEEP_MODE		= 0x09
 };
 
-
 struct dvbt_set_parameters_msg {
 	uint8_t cmd;
 	uint32_t freq;
@@ -87,7 +85,6 @@ struct dvbt_set_parameters_msg {
 	uint8_t flags;
 } __attribute__((packed));
 
-
 struct dvbt_get_status_msg {
 	uint32_t freq;
 	uint8_t bandwidth;
@@ -102,9 +99,7 @@ struct dvbt_get_status_msg {
 	uint8_t prev_lock_bits;
 } __attribute__((packed));
 
-
-static
-struct dvb_frontend_info cinergyt2_fe_info = {
+static struct dvb_frontend_info cinergyt2_fe_info = {
 	.name = DRIVER_NAME,
 	.type = FE_OFDM,
 	.frequency_min = 174000000,
@@ -340,9 +335,7 @@ static int cinergyt2_start_stream_xfer (struct cinergyt2 *cinergyt2)
 	return 0;
 }
 
-
-static
-int cinergyt2_start_feed(struct dvb_demux_feed *dvbdmxfeed)
+static int cinergyt2_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
 	struct dvb_demux *demux = dvbdmxfeed->demux;
 	struct cinergyt2 *cinergyt2 = demux->priv;
@@ -358,9 +351,7 @@ int cinergyt2_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 	return 0;
 }
 
-
-static
-int cinergyt2_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
+static int cinergyt2_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
 	struct dvb_demux *demux = dvbdmxfeed->demux;
 	struct cinergyt2 *cinergyt2 = demux->priv;
@@ -384,8 +375,7 @@ int cinergyt2_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
  *
  *  We replace errornous fields by default TPS fields (the ones with value 0).
  */
-static
-uint16_t compute_tps (struct dvb_frontend_parameters *p)
+static uint16_t compute_tps (struct dvb_frontend_parameters *p)
 {
 	struct dvb_ofdm_parameters *op = &p->u.ofdm;
 	uint16_t tps = 0;
@@ -482,8 +472,7 @@ uint16_t compute_tps (struct dvb_frontend_parameters *p)
 	return tps;
 }
 
-static
-int cinergyt2_open (struct inode *inode, struct file *file)
+static int cinergyt2_open (struct inode *inode, struct file *file)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
@@ -504,8 +493,7 @@ int cinergyt2_open (struct inode *inode, struct file *file)
 	return 0;
 }
 
-static
-int cinergyt2_release (struct inode *inode, struct file *file)
+static int cinergyt2_release (struct inode *inode, struct file *file)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
@@ -524,9 +512,7 @@ int cinergyt2_release (struct inode *inode, struct file *file)
 	return dvb_generic_release(inode, file);
 }
 
-
-static
-unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct *wait)
+static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct *wait)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
@@ -535,9 +521,7 @@ unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct *wait)
 }
 
 
-
-static
-int cinergyt2_ioctl (struct inode *inode, struct file *file,
+static int cinergyt2_ioctl (struct inode *inode, struct file *file,
 		     unsigned cmd, unsigned long arg)
 {
 	struct dvb_device *dvbdev = file->private_data;
@@ -622,9 +606,7 @@ int cinergyt2_ioctl (struct inode *inode, struct file *file,
 	return -EINVAL;
 }
 
-
-static
-int cinergyt2_mmap(struct file *file, struct vm_area_struct *vma)
+static int cinergyt2_mmap(struct file *file, struct vm_area_struct *vma)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
@@ -654,9 +636,7 @@ bailout:
 	return ret;
 }
 
-
-static
-struct file_operations cinergyt2_fops = {
+static struct file_operations cinergyt2_fops = {
 	.owner          = THIS_MODULE,
 	.ioctl		= cinergyt2_ioctl,
 	.poll           = cinergyt2_poll,
@@ -672,7 +652,6 @@ static struct dvb_device cinergyt2_fe_template = {
 	.fops = &cinergyt2_fops
 };
 
-
 #ifdef ENABLE_RC
 static void cinergyt2_query_rc (void *data)
 {
@@ -755,8 +734,7 @@ static void cinergyt2_query (void *data)
 	up(&cinergyt2->sem);
 }
 
-static
-int cinergyt2_probe (struct usb_interface *intf,
+static int cinergyt2_probe (struct usb_interface *intf,
 		  const struct usb_device_id *id)
 {
 	struct cinergyt2 *cinergyt2;
@@ -794,8 +772,7 @@ int cinergyt2_probe (struct usb_interface *intf,
 					    DMX_MEMORY_BASED_FILTERING;
 
 	if ((err = dvb_dmx_init(&cinergyt2->demux)) < 0) {
-		printk("%s: dvb_dmx_init() failed (err = %d)\n",
-		       __FUNCTION__, err);
+		dprintk("dvb_dmx_init() failed (err = %d)\n", err);
 		goto bailout;
 	}
 
@@ -804,13 +781,12 @@ int cinergyt2_probe (struct usb_interface *intf,
 	cinergyt2->dmxdev.capabilities = 0;
 
 	if ((err = dvb_dmxdev_init(&cinergyt2->dmxdev, cinergyt2->adapter)) < 0) {
-		printk("%s: dvb_dmxdev_init() failed (err = %d)\n",
-		       __FUNCTION__, err);
+		dprintk("dvb_dmxdev_init() failed (err = %d)\n", err);
 		goto bailout;
 	}
 
 	if (dvb_net_init(cinergyt2->adapter, &cinergyt2->dvbnet, &cinergyt2->demux.dmx))
-		printk("%s: dvb_net_init failed!\n", __FUNCTION__);
+		dprintk(1, "dvb_net_init() failed!\n");
 
 	dvb_register_device(cinergyt2->adapter, &cinergyt2->fedev,
 			    &cinergyt2_fe_template, cinergyt2,
@@ -870,8 +846,7 @@ static void cinergyt2_disconnect (struct usb_interface *intf)
 	kfree(cinergyt2);
 }
 
-static
-int cinergyt2_suspend (struct usb_interface *intf, u32 state)
+static int cinergyt2_suspend (struct usb_interface *intf, u32 state)
 {
 	struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
 
@@ -894,9 +869,7 @@ int cinergyt2_suspend (struct usb_interface *intf, u32 state)
 	return 0;
 }
 
-
-static
-int cinergyt2_resume (struct usb_interface *intf)
+static int cinergyt2_resume (struct usb_interface *intf)
 {
 	struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
 	struct dvbt_set_parameters_msg *param = &cinergyt2->param;
@@ -919,35 +892,29 @@ int cinergyt2_resume (struct usb_interface *intf)
 	return 0;
 }
 
-
-static const
-struct usb_device_id cinergyt2_table [] __devinitdata = {
+static const struct usb_device_id cinergyt2_table [] __devinitdata = {
 	{ USB_DEVICE(0x0ccd, 0x0038) },
 	{ 0 }
 };
 
-
 MODULE_DEVICE_TABLE(usb, cinergyt2_table);
 
 static struct usb_driver cinergyt2_driver = {
-	.owner = THIS_MODULE,
-	.name = "cinergyT2",
-	.probe = cinergyt2_probe,
-	.disconnect = cinergyt2_disconnect,
-	.suspend = cinergyt2_suspend,
-	.resume = cinergyt2_resume,
-	.id_table = cinergyt2_table
+	.owner	= THIS_MODULE,
+	.name	= "cinergyT2",
+	.probe	= cinergyt2_probe,
+	.disconnect	= cinergyt2_disconnect,
+	.suspend	= cinergyt2_suspend,
+	.resume		= cinergyt2_resume,
+	.id_table	= cinergyt2_table
 };
 
-
-static
-int __init cinergyt2_init (void)
+static int __init cinergyt2_init (void)
 {
 	int err;
 
 	if ((err = usb_register(&cinergyt2_driver)) < 0)
-		printk("%s: usb_register() failed! (err %i)\n",
-		       __FUNCTION__, err);
+		dprintk(1, "usb_register() failed! (err %i)\n", err);
 
 	return err;
 }