diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-04-18 20:42:30 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:09:43 -0400 |
commit | f07e8e4bb790f6cb462d5d5425193cad874ac0de (patch) | |
tree | 904759efada2d55794af274e530623491f539c96 /drivers/media/video/au0828/au0828-core.c | |
parent | fdfc7452f17eb65eb29a143cf992ea2b8d262c7a (diff) |
V4L/DVB (7627): au0828: replace __FUNCTION__ with __func__
replace __FUNCTION__ with __func__ and clean associated checkpatch.pl
warnings.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/au0828/au0828-core.c')
-rw-r--r-- | drivers/media/video/au0828/au0828-core.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c index 76801d135f2..efecac3979a 100644 --- a/drivers/media/video/au0828/au0828-core.c +++ b/drivers/media/video/au0828/au0828-core.c | |||
@@ -59,13 +59,13 @@ static int recv_control_msg(struct au0828_dev *dev, u16 request, u32 value, | |||
59 | u32 au0828_readreg(struct au0828_dev *dev, u16 reg) | 59 | u32 au0828_readreg(struct au0828_dev *dev, u16 reg) |
60 | { | 60 | { |
61 | recv_control_msg(dev, CMD_REQUEST_IN, 0, reg, dev->ctrlmsg, 1); | 61 | recv_control_msg(dev, CMD_REQUEST_IN, 0, reg, dev->ctrlmsg, 1); |
62 | dprintk(8, "%s(0x%x) = 0x%x\n", __FUNCTION__, reg, dev->ctrlmsg[0]); | 62 | dprintk(8, "%s(0x%x) = 0x%x\n", __func__, reg, dev->ctrlmsg[0]); |
63 | return dev->ctrlmsg[0]; | 63 | return dev->ctrlmsg[0]; |
64 | } | 64 | } |
65 | 65 | ||
66 | u32 au0828_writereg(struct au0828_dev *dev, u16 reg, u32 val) | 66 | u32 au0828_writereg(struct au0828_dev *dev, u16 reg, u32 val) |
67 | { | 67 | { |
68 | dprintk(8, "%s(0x%x, 0x%x)\n", __FUNCTION__, reg, val); | 68 | dprintk(8, "%s(0x%x, 0x%x)\n", __func__, reg, val); |
69 | return send_control_msg(dev, CMD_REQUEST_OUT, val, reg, dev->ctrlmsg, 0); | 69 | return send_control_msg(dev, CMD_REQUEST_OUT, val, reg, dev->ctrlmsg, 0); |
70 | } | 70 | } |
71 | 71 | ||
@@ -76,7 +76,7 @@ static void cmd_msg_dump(struct au0828_dev *dev) | |||
76 | for (i = 0;i < sizeof(dev->ctrlmsg); i+=16) | 76 | for (i = 0;i < sizeof(dev->ctrlmsg); i+=16) |
77 | dprintk(2,"%s() %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x " | 77 | dprintk(2,"%s() %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x " |
78 | "%02x %02x %02x %02x %02x %02x\n", | 78 | "%02x %02x %02x %02x %02x %02x\n", |
79 | __FUNCTION__, | 79 | __func__, |
80 | dev->ctrlmsg[i+0], dev->ctrlmsg[i+1], | 80 | dev->ctrlmsg[i+0], dev->ctrlmsg[i+1], |
81 | dev->ctrlmsg[i+2], dev->ctrlmsg[i+3], | 81 | dev->ctrlmsg[i+2], dev->ctrlmsg[i+3], |
82 | dev->ctrlmsg[i+4], dev->ctrlmsg[i+5], | 82 | dev->ctrlmsg[i+4], dev->ctrlmsg[i+5], |
@@ -106,8 +106,7 @@ static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value, | |||
106 | 106 | ||
107 | if (status < 0) { | 107 | if (status < 0) { |
108 | printk(KERN_ERR "%s() Failed sending control message, error %d.\n", | 108 | printk(KERN_ERR "%s() Failed sending control message, error %d.\n", |
109 | __FUNCTION__, | 109 | __func__, status); |
110 | status); | ||
111 | } | 110 | } |
112 | 111 | ||
113 | } | 112 | } |
@@ -136,8 +135,7 @@ static int recv_control_msg(struct au0828_dev *dev, u16 request, u32 value, | |||
136 | 135 | ||
137 | if (status < 0) { | 136 | if (status < 0) { |
138 | printk(KERN_ERR "%s() Failed receiving control message, error %d.\n", | 137 | printk(KERN_ERR "%s() Failed receiving control message, error %d.\n", |
139 | __FUNCTION__, | 138 | __func__, status); |
140 | status); | ||
141 | } | 139 | } |
142 | else | 140 | else |
143 | cmd_msg_dump(dev); | 141 | cmd_msg_dump(dev); |
@@ -149,7 +147,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface) | |||
149 | { | 147 | { |
150 | struct au0828_dev *dev = usb_get_intfdata(interface); | 148 | struct au0828_dev *dev = usb_get_intfdata(interface); |
151 | 149 | ||
152 | dprintk(1,"%s()\n", __FUNCTION__); | 150 | dprintk(1, "%s()\n", __func__); |
153 | 151 | ||
154 | /* Digital TV */ | 152 | /* Digital TV */ |
155 | au0828_dvb_unregister(dev); | 153 | au0828_dvb_unregister(dev); |
@@ -179,15 +177,14 @@ static int au0828_usb_probe (struct usb_interface *interface, | |||
179 | if (ifnum != 0) | 177 | if (ifnum != 0) |
180 | return -ENODEV; | 178 | return -ENODEV; |
181 | 179 | ||
182 | dprintk(1,"%s() vendor id 0x%x device id 0x%x ifnum:%d\n", | 180 | dprintk(1,"%s() vendor id 0x%x device id 0x%x ifnum:%d\n", __func__, |
183 | __FUNCTION__, | ||
184 | le16_to_cpu(usbdev->descriptor.idVendor), | 181 | le16_to_cpu(usbdev->descriptor.idVendor), |
185 | le16_to_cpu(usbdev->descriptor.idProduct), | 182 | le16_to_cpu(usbdev->descriptor.idProduct), |
186 | ifnum); | 183 | ifnum); |
187 | 184 | ||
188 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 185 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
189 | if (dev == NULL) { | 186 | if (dev == NULL) { |
190 | printk(KERN_ERR "%s() Unable to allocate memory\n", __FUNCTION__); | 187 | printk(KERN_ERR "%s() Unable to allocate memory\n", __func__); |
191 | return -ENOMEM; | 188 | return -ENOMEM; |
192 | } | 189 | } |
193 | 190 | ||
@@ -232,20 +229,21 @@ static int __init au0828_init(void) | |||
232 | int ret; | 229 | int ret; |
233 | 230 | ||
234 | if(debug) | 231 | if(debug) |
235 | printk(KERN_INFO "%s() Debugging is enabled\n", __FUNCTION__); | 232 | printk(KERN_INFO "%s() Debugging is enabled\n", __func__); |
236 | 233 | ||
237 | if(usb_debug) { | 234 | if(usb_debug) { |
238 | printk(KERN_INFO "%s() USB Debugging is enabled\n", __FUNCTION__); | 235 | printk(KERN_INFO "%s() USB Debugging is enabled\n", __func__); |
239 | debug |= 2; | 236 | debug |= 2; |
240 | } | 237 | } |
241 | 238 | ||
242 | if(i2c_debug) { | 239 | if(i2c_debug) { |
243 | printk(KERN_INFO "%s() I2C Debugging is enabled\n", __FUNCTION__); | 240 | printk(KERN_INFO "%s() I2C Debugging is enabled\n", __func__); |
244 | debug |= 4; | 241 | debug |= 4; |
245 | } | 242 | } |
246 | 243 | ||
247 | if(bridge_debug) { | 244 | if(bridge_debug) { |
248 | printk(KERN_INFO "%s() Bridge Debugging is enabled\n", __FUNCTION__); | 245 | printk(KERN_INFO "%s() Bridge Debugging is enabled\n", |
246 | __func__); | ||
249 | debug |= 8; | 247 | debug |= 8; |
250 | } | 248 | } |
251 | 249 | ||