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

Commit ea3e6c59 authored by Harvey Harrison's avatar Harvey Harrison Committed by Dmitry Torokhov
Browse files

Input: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent f26a3988

drivers/input/joystick/iforce/iforce-usb.c

+3 −3
Original line number Diff line number Diff line
@@ -89,10 +89,10 @@ static void iforce_usb_irq(struct urb *urb) 
	case -ESHUTDOWN:

		/* this urb is terminated, clean up */

		dbg("%s - urb shutting down with status: %d",

		    __FUNCTION__, urb->status);

		    __func__, urb->status);

		return;

	default:

		dbg("%s - urb has status of: %d", __FUNCTION__, urb->status);

		dbg("%s - urb has status of: %d", __func__, urb->status);

		goto exit;

	}
@@ -103,7 +103,7 @@ static void iforce_usb_irq(struct urb *urb) 
	status = usb_submit_urb (urb, GFP_ATOMIC);

	if (status)

		err ("%s - usb_submit_urb failed with result %d",

		     __FUNCTION__, status);

		     __func__, status);

}



static void iforce_usb_out(struct urb *urb)

drivers/input/joystick/xpad.c

+6 −6
Original line number Diff line number Diff line
@@ -418,11 +418,11 @@ static void xpad_irq_in(struct urb *urb) 
	case -ESHUTDOWN:

		/* this urb is terminated, clean up */

		dbg("%s - urb shutting down with status: %d",

			__FUNCTION__, status);

			__func__, status);

		return;

	default:

		dbg("%s - nonzero urb status received: %d",

			__FUNCTION__, status);

			__func__, status);

		goto exit;

	}
@@ -441,7 +441,7 @@ static void xpad_irq_in(struct urb *urb) 
	retval = usb_submit_urb (urb, GFP_ATOMIC);

	if (retval)

		err ("%s - usb_submit_urb failed with result %d",

		     __FUNCTION__, retval);

		     __func__, retval);

}



static void xpad_bulk_out(struct urb *urb)
@@ -477,11 +477,11 @@ static void xpad_irq_out(struct urb *urb) 
		case -ESHUTDOWN:

			/* this urb is terminated, clean up */

			dbg("%s - urb shutting down with status: %d",

				__FUNCTION__, status);

				__func__, status);

			return;

		default:

			dbg("%s - nonzero urb status received: %d",

				__FUNCTION__, status);

				__func__, status);

			goto exit;

	}
@@ -489,7 +489,7 @@ static void xpad_irq_out(struct urb *urb) 
	retval = usb_submit_urb(urb, GFP_ATOMIC);

	if (retval)

		err("%s - usb_submit_urb failed with result %d",

		    __FUNCTION__, retval);

		    __func__, retval);

}



static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)

drivers/input/keyboard/lkkbd.c

+3 −3
Original line number Diff line number Diff line
@@ -538,11 +538,11 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code, 
			switch (code) {

				case SND_CLICK:

					if (value == 0) {

						DBG ("%s: Deactivating key clicks\n", __FUNCTION__);

						DBG ("%s: Deactivating key clicks\n", __func__);

						lk->serio->write (lk->serio, LK_CMD_DISABLE_KEYCLICK);

						lk->serio->write (lk->serio, LK_CMD_DISABLE_CTRCLICK);

					} else {

						DBG ("%s: Activating key clicks\n", __FUNCTION__);

						DBG ("%s: Activating key clicks\n", __func__);

						lk->serio->write (lk->serio, LK_CMD_ENABLE_KEYCLICK);

						lk->serio->write (lk->serio, volume_to_hw (lk->keyclick_volume));

						lk->serio->write (lk->serio, LK_CMD_ENABLE_CTRCLICK);
@@ -560,7 +560,7 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code, 


		default:

			printk (KERN_ERR "%s (): Got unknown type %d, code %d, value %d\n",

					__FUNCTION__, type, code, value);

					__func__, type, code, value);

	}



	return -1;

drivers/input/misc/ati_remote.c

+9 −9
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static int ati_remote_open(struct input_dev *inputdev) 
	ati_remote->irq_urb->dev = ati_remote->udev;

	if (usb_submit_urb(ati_remote->irq_urb, GFP_KERNEL)) {

		dev_err(&ati_remote->interface->dev,

			"%s: usb_submit_urb failed!\n", __FUNCTION__);

			"%s: usb_submit_urb failed!\n", __func__);

		return -EIO;

	}
@@ -356,7 +356,7 @@ static void ati_remote_irq_out(struct urb *urb) 


	if (urb->status) {

		dev_dbg(&ati_remote->interface->dev, "%s: status %d\n",

			__FUNCTION__, urb->status);

			__func__, urb->status);

		return;

	}
@@ -601,17 +601,17 @@ static void ati_remote_irq_in(struct urb *urb) 
	case -ENOENT:

	case -ESHUTDOWN:

		dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink? \n",

			__FUNCTION__);

			__func__);

		return;

	default:		/* error */

		dev_dbg(&ati_remote->interface->dev, "%s: Nonzero urb status %d\n",

			__FUNCTION__, urb->status);

			__func__, urb->status);

	}



	retval = usb_submit_urb(urb, GFP_ATOMIC);

	if (retval)

		dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n",

			__FUNCTION__, retval);

			__func__, retval);

}



/*
@@ -734,7 +734,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de 
	int err = -ENOMEM;



	if (iface_host->desc.bNumEndpoints != 2) {

		err("%s: Unexpected desc.bNumEndpoints\n", __FUNCTION__);

		err("%s: Unexpected desc.bNumEndpoints\n", __func__);

		return -ENODEV;

	}
@@ -742,11 +742,11 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de 
	endpoint_out = &iface_host->endpoint[1].desc;



	if (!usb_endpoint_is_int_in(endpoint_in)) {

		err("%s: Unexpected endpoint_in\n", __FUNCTION__);

		err("%s: Unexpected endpoint_in\n", __func__);

		return -ENODEV;

	}

	if (le16_to_cpu(endpoint_in->wMaxPacketSize) == 0) {

		err("%s: endpoint_in message size==0? \n", __FUNCTION__);

		err("%s: endpoint_in message size==0? \n", __func__);

		return -ENODEV;

	}
@@ -814,7 +814,7 @@ static void ati_remote_disconnect(struct usb_interface *interface) 
	ati_remote = usb_get_intfdata(interface);

	usb_set_intfdata(interface, NULL);

	if (!ati_remote) {

		warn("%s - null device?\n", __FUNCTION__);

		warn("%s - null device?\n", __func__);

		return;

	}

drivers/input/misc/ati_remote2.c

+9 −9
Original line number Diff line number Diff line
@@ -137,14 +137,14 @@ static int ati_remote2_open(struct input_dev *idev) 
	r = usb_submit_urb(ar2->urb[0], GFP_KERNEL);

	if (r) {

		dev_err(&ar2->intf[0]->dev,

			"%s: usb_submit_urb() = %d\n", __FUNCTION__, r);

			"%s: usb_submit_urb() = %d\n", __func__, r);

		return r;

	}

	r = usb_submit_urb(ar2->urb[1], GFP_KERNEL);

	if (r) {

		usb_kill_urb(ar2->urb[0]);

		dev_err(&ar2->intf[1]->dev,

			"%s: usb_submit_urb() = %d\n", __FUNCTION__, r);

			"%s: usb_submit_urb() = %d\n", __func__, r);

		return r;

	}
@@ -294,17 +294,17 @@ static void ati_remote2_complete_mouse(struct urb *urb) 
	case -ECONNRESET:

	case -ESHUTDOWN:

		dev_dbg(&ar2->intf[0]->dev,

			"%s(): urb status = %d\n", __FUNCTION__, urb->status);

			"%s(): urb status = %d\n", __func__, urb->status);

		return;

	default:

		dev_err(&ar2->intf[0]->dev,

			"%s(): urb status = %d\n", __FUNCTION__, urb->status);

			"%s(): urb status = %d\n", __func__, urb->status);

	}



	r = usb_submit_urb(urb, GFP_ATOMIC);

	if (r)

		dev_err(&ar2->intf[0]->dev,

			"%s(): usb_submit_urb() = %d\n", __FUNCTION__, r);

			"%s(): usb_submit_urb() = %d\n", __func__, r);

}



static void ati_remote2_complete_key(struct urb *urb)
@@ -321,17 +321,17 @@ static void ati_remote2_complete_key(struct urb *urb) 
	case -ECONNRESET:

	case -ESHUTDOWN:

		dev_dbg(&ar2->intf[1]->dev,

			"%s(): urb status = %d\n", __FUNCTION__, urb->status);

			"%s(): urb status = %d\n", __func__, urb->status);

		return;

	default:

		dev_err(&ar2->intf[1]->dev,

			"%s(): urb status = %d\n", __FUNCTION__, urb->status);

			"%s(): urb status = %d\n", __func__, urb->status);

	}



	r = usb_submit_urb(urb, GFP_ATOMIC);

	if (r)

		dev_err(&ar2->intf[1]->dev,

			"%s(): usb_submit_urb() = %d\n", __FUNCTION__, r);

			"%s(): usb_submit_urb() = %d\n", __func__, r);

}



static int ati_remote2_input_init(struct ati_remote2 *ar2)
@@ -438,7 +438,7 @@ static int ati_remote2_setup(struct ati_remote2 *ar2) 
			    channel, 0x0, NULL, 0, USB_CTRL_SET_TIMEOUT);

	if (r) {

		dev_err(&ar2->udev->dev, "%s - failed to set channel due to error: %d\n",

			__FUNCTION__, r);

			__func__, r);

		return r;

	}