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

Commit d08310fe authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Move ACPI timer prototypes to public acpixf file 



These prototypes were incorrectly declared in achware.h.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 2feec47d

drivers/acpi/acpica/achware.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -145,16 +145,4 @@ acpi_status 
acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,

acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,

		      acpi_handle root_pci_device, acpi_handle pci_region);

		      acpi_handle root_pci_device, acpi_handle pci_region);





#ifdef	ACPI_FUTURE_USAGE

/*

 * hwtimer - ACPI Timer prototypes

 */

acpi_status acpi_get_timer_resolution(u32 * resolution);



acpi_status acpi_get_timer(u32 * ticks);



acpi_status

acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed);

#endif				/* ACPI_FUTURE_USAGE */



#endif				/* __ACHWARE_H__ */
 
#endif				/* __ACHWARE_H__ */

include/acpi/acpixf.h

+12 −0
Original line number Original line Diff line number Diff line
@@ -418,6 +418,18 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state); 




acpi_status acpi_leave_sleep_state(u8 sleep_state);

acpi_status acpi_leave_sleep_state(u8 sleep_state);





/*

 * ACPI Timer interfaces

 */

#ifdef ACPI_FUTURE_USAGE

acpi_status acpi_get_timer_resolution(u32 *resolution);



acpi_status acpi_get_timer(u32 *ticks);



acpi_status

acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 *time_elapsed);

#endif				/* ACPI_FUTURE_USAGE */



/*

/*

 * Error/Warning output

 * Error/Warning output

 */

 */