Commit 925ffff2 authored by Ravi Chandra Sadineni's avatar Ravi Chandra Sadineni Committed by Dmitry Torokhov
Browse files

Input: cros_ec_keyb - remove check before calling pm_wakeup_event 



Remove the unnecessary check before calling pm_wakeup_event. If the
device is not wake enabled, this call is no-op anyway.

Signed-off-by: default avatarRavi Chandra Sadineni <ravisadineni@chromium.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 27fff221

drivers/input/keyboard/cros_ec_keyb.c

+11 −19
Original line number Diff line number Diff line
@@ -232,19 +232,17 @@ static int cros_ec_keyb_work(struct notifier_block *nb, 
	u32 val;

	unsigned int ev_type;



	switch (ckdev->ec->event_data.event_type) {

	case EC_MKBP_EVENT_KEY_MATRIX:

		if (device_may_wakeup(ckdev->dev)) {

			pm_wakeup_event(ckdev->dev, 0);

		} else {

	/*

			 * If keyboard is not wake enabled, discard key state

			 * changes during suspend. Switches will be re-checked

			 * in cros_ec_keyb_resume() to be sure nothing is lost.

	 * If not wake enabled, discard key state changes during

	 * suspend. Switches will be re-checked in

	 * cros_ec_keyb_resume() to be sure nothing is lost.

	 */

			if (queued_during_suspend)

	if (queued_during_suspend && !device_may_wakeup(ckdev->dev))

		return NOTIFY_OK;

		}



	switch (ckdev->ec->event_data.event_type) {

	case EC_MKBP_EVENT_KEY_MATRIX:

		pm_wakeup_event(ckdev->dev, 0);



		if (ckdev->ec->event_size != ckdev->cols) {

			dev_err(ckdev->dev,
@@ -258,10 +256,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb, 
		break;



	case EC_MKBP_EVENT_SYSRQ:

		if (device_may_wakeup(ckdev->dev))

		pm_wakeup_event(ckdev->dev, 0);

		else if (queued_during_suspend)

			return NOTIFY_OK;



		val = get_unaligned_le32(&ckdev->ec->event_data.data.sysrq);

		dev_dbg(ckdev->dev, "sysrq code from EC: %#x\n", val);
@@ -270,10 +265,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb, 


	case EC_MKBP_EVENT_BUTTON:

	case EC_MKBP_EVENT_SWITCH:

		if (device_may_wakeup(ckdev->dev))

		pm_wakeup_event(ckdev->dev, 0);

		else if (queued_during_suspend)

			return NOTIFY_OK;



		if (ckdev->ec->event_data.event_type == EC_MKBP_EVENT_BUTTON) {

			val = get_unaligned_le32(

CRA Git | Maintained and supported by SUSTech CRA and CCSE