Commit d7589404 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: EC: PM: Consolidate some code depending on PM_SLEEP 



Move some routines, including acpi_ec_dispatch_gpe(), that are only
used if CONFIG_PM_SLEEP is set to the #ifdef block containing the EC
suspend and resume callbacks, to make the "full EC PM picture" easier
to follow.

While at it, move the header of acpi_ec_dispatch_gpe() in the
header file to a CONFIG_PM_SLEEP #ifdef block.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
parent 6e86633a

drivers/acpi/ec.c

+26 −28
Original line number Diff line number Diff line
@@ -1049,33 +1049,6 @@ void acpi_ec_unblock_transactions(void) 
		acpi_ec_start(first_ec, true);

}



#ifdef CONFIG_PM_SLEEP

void acpi_ec_mark_gpe_for_wake(void)

{

	if (first_ec && !ec_no_wakeup)

		acpi_mark_gpe_for_wake(NULL, first_ec->gpe);

}

EXPORT_SYMBOL_GPL(acpi_ec_mark_gpe_for_wake);



void acpi_ec_set_gpe_wake_mask(u8 action)

{

	if (pm_suspend_no_platform() && first_ec && !ec_no_wakeup)

		acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);

}

EXPORT_SYMBOL_GPL(acpi_ec_set_gpe_wake_mask);

#endif



bool acpi_ec_dispatch_gpe(void)

{

	u32 ret;



	if (!first_ec)

		return false;



	ret = acpi_dispatch_gpe(NULL, first_ec->gpe);

	return ret == ACPI_INTERRUPT_HANDLED;

}



/* --------------------------------------------------------------------------

                                Event Management

   -------------------------------------------------------------------------- */
@@ -1984,7 +1957,32 @@ static int acpi_ec_resume(struct device *dev) 
	acpi_ec_enable_event(ec);

	return 0;

}

#endif



void acpi_ec_mark_gpe_for_wake(void)

{

	if (first_ec && !ec_no_wakeup)

		acpi_mark_gpe_for_wake(NULL, first_ec->gpe);

}

EXPORT_SYMBOL_GPL(acpi_ec_mark_gpe_for_wake);



void acpi_ec_set_gpe_wake_mask(u8 action)

{

	if (pm_suspend_no_platform() && first_ec && !ec_no_wakeup)

		acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);

}

EXPORT_SYMBOL_GPL(acpi_ec_set_gpe_wake_mask);



bool acpi_ec_dispatch_gpe(void)

{

	u32 ret;



	if (!first_ec)

		return false;



	ret = acpi_dispatch_gpe(NULL, first_ec->gpe);

	return ret == ACPI_INTERRUPT_HANDLED;

}

#endif /* CONFIG_PM_SLEEP */



static const struct dev_pm_ops acpi_ec_pm = {

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(acpi_ec_suspend_noirq, acpi_ec_resume_noirq)

drivers/acpi/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ void acpi_ec_ecdt_probe(void); 
void acpi_ec_dsdt_probe(void);

void acpi_ec_block_transactions(void);

void acpi_ec_unblock_transactions(void);

bool acpi_ec_dispatch_gpe(void);

int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,

			      acpi_handle handle, acpi_ec_query_func func,

			      void *data);
@@ -202,6 +201,7 @@ void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit); 


#ifdef CONFIG_PM_SLEEP

void acpi_ec_flush_work(void);

bool acpi_ec_dispatch_gpe(void);

#endif