diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-05-05 11:36:18 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-05-16 14:45:58 -0400 |
commit | ea3e6c59266b783b103c0f42a8de5dbe565a43d4 (patch) | |
tree | b9dce06a3180e4a64eaa1dd3b45e8e070e39c315 /drivers/input/misc/keyspan_remote.c | |
parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) |
Input: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/misc/keyspan_remote.c')
-rw-r--r-- | drivers/input/misc/keyspan_remote.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c index 952938a8e991..86afdd1fdf9d 100644 --- a/drivers/input/misc/keyspan_remote.c +++ b/drivers/input/misc/keyspan_remote.c | |||
@@ -159,7 +159,7 @@ static int keyspan_load_tester(struct usb_keyspan* dev, int bits_needed) | |||
159 | if (dev->data.pos >= dev->data.len) { | 159 | if (dev->data.pos >= dev->data.len) { |
160 | dev_dbg(&dev->udev->dev, | 160 | dev_dbg(&dev->udev->dev, |
161 | "%s - Error ran out of data. pos: %d, len: %d\n", | 161 | "%s - Error ran out of data. pos: %d, len: %d\n", |
162 | __FUNCTION__, dev->data.pos, dev->data.len); | 162 | __func__, dev->data.pos, dev->data.len); |
163 | return -1; | 163 | return -1; |
164 | } | 164 | } |
165 | 165 | ||
@@ -267,7 +267,7 @@ static void keyspan_check_data(struct usb_keyspan *remote) | |||
267 | remote->data.tester = remote->data.tester >> 6; | 267 | remote->data.tester = remote->data.tester >> 6; |
268 | remote->data.bits_left -= 6; | 268 | remote->data.bits_left -= 6; |
269 | } else { | 269 | } else { |
270 | err("%s - Unknown sequence found in system data.\n", __FUNCTION__); | 270 | err("%s - Unknown sequence found in system data.\n", __func__); |
271 | remote->stage = 0; | 271 | remote->stage = 0; |
272 | return; | 272 | return; |
273 | } | 273 | } |
@@ -286,7 +286,7 @@ static void keyspan_check_data(struct usb_keyspan *remote) | |||
286 | remote->data.tester = remote->data.tester >> 6; | 286 | remote->data.tester = remote->data.tester >> 6; |
287 | remote->data.bits_left -= 6; | 287 | remote->data.bits_left -= 6; |
288 | } else { | 288 | } else { |
289 | err("%s - Unknown sequence found in button data.\n", __FUNCTION__); | 289 | err("%s - Unknown sequence found in button data.\n", __func__); |
290 | remote->stage = 0; | 290 | remote->stage = 0; |
291 | return; | 291 | return; |
292 | } | 292 | } |
@@ -302,7 +302,7 @@ static void keyspan_check_data(struct usb_keyspan *remote) | |||
302 | remote->data.tester = remote->data.tester >> 6; | 302 | remote->data.tester = remote->data.tester >> 6; |
303 | remote->data.bits_left -= 6; | 303 | remote->data.bits_left -= 6; |
304 | } else { | 304 | } else { |
305 | err("%s - Error in message, invalid toggle.\n", __FUNCTION__); | 305 | err("%s - Error in message, invalid toggle.\n", __func__); |
306 | remote->stage = 0; | 306 | remote->stage = 0; |
307 | return; | 307 | return; |
308 | } | 308 | } |
@@ -317,7 +317,7 @@ static void keyspan_check_data(struct usb_keyspan *remote) | |||
317 | 317 | ||
318 | dev_dbg(&remote->udev->dev, | 318 | dev_dbg(&remote->udev->dev, |
319 | "%s found valid message: system: %d, button: %d, toggle: %d\n", | 319 | "%s found valid message: system: %d, button: %d, toggle: %d\n", |
320 | __FUNCTION__, message.system, message.button, message.toggle); | 320 | __func__, message.system, message.button, message.toggle); |
321 | 321 | ||
322 | if (message.toggle != remote->toggle) { | 322 | if (message.toggle != remote->toggle) { |
323 | keyspan_report_button(remote, message.button, 1); | 323 | keyspan_report_button(remote, message.button, 1); |
@@ -341,7 +341,7 @@ static int keyspan_setup(struct usb_device* dev) | |||
341 | 0x11, 0x40, 0x5601, 0x0, NULL, 0, 0); | 341 | 0x11, 0x40, 0x5601, 0x0, NULL, 0, 0); |
342 | if (retval) { | 342 | if (retval) { |
343 | dev_dbg(&dev->dev, "%s - failed to set bit rate due to error: %d\n", | 343 | dev_dbg(&dev->dev, "%s - failed to set bit rate due to error: %d\n", |
344 | __FUNCTION__, retval); | 344 | __func__, retval); |
345 | return(retval); | 345 | return(retval); |
346 | } | 346 | } |
347 | 347 | ||
@@ -349,7 +349,7 @@ static int keyspan_setup(struct usb_device* dev) | |||
349 | 0x44, 0x40, 0x0, 0x0, NULL, 0, 0); | 349 | 0x44, 0x40, 0x0, 0x0, NULL, 0, 0); |
350 | if (retval) { | 350 | if (retval) { |
351 | dev_dbg(&dev->dev, "%s - failed to set resume sensitivity due to error: %d\n", | 351 | dev_dbg(&dev->dev, "%s - failed to set resume sensitivity due to error: %d\n", |
352 | __FUNCTION__, retval); | 352 | __func__, retval); |
353 | return(retval); | 353 | return(retval); |
354 | } | 354 | } |
355 | 355 | ||
@@ -357,11 +357,11 @@ static int keyspan_setup(struct usb_device* dev) | |||
357 | 0x22, 0x40, 0x0, 0x0, NULL, 0, 0); | 357 | 0x22, 0x40, 0x0, 0x0, NULL, 0, 0); |
358 | if (retval) { | 358 | if (retval) { |
359 | dev_dbg(&dev->dev, "%s - failed to turn receive on due to error: %d\n", | 359 | dev_dbg(&dev->dev, "%s - failed to turn receive on due to error: %d\n", |
360 | __FUNCTION__, retval); | 360 | __func__, retval); |
361 | return(retval); | 361 | return(retval); |
362 | } | 362 | } |
363 | 363 | ||
364 | dev_dbg(&dev->dev, "%s - Setup complete.\n", __FUNCTION__); | 364 | dev_dbg(&dev->dev, "%s - Setup complete.\n", __func__); |
365 | return(retval); | 365 | return(retval); |
366 | } | 366 | } |
367 | 367 | ||
@@ -397,7 +397,7 @@ static void keyspan_irq_recv(struct urb *urb) | |||
397 | resubmit: | 397 | resubmit: |
398 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 398 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
399 | if (retval) | 399 | if (retval) |
400 | err ("%s - usb_submit_urb failed with result: %d", __FUNCTION__, retval); | 400 | err ("%s - usb_submit_urb failed with result: %d", __func__, retval); |
401 | } | 401 | } |
402 | 402 | ||
403 | static int keyspan_open(struct input_dev *dev) | 403 | static int keyspan_open(struct input_dev *dev) |