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

Commit ee1ce6fc authored by Jean Delvare's avatar Jean Delvare Committed by Len Brown
Browse files

ACPI: cleanup acpi.h 



Two cleanups to <linux/acpi.h>:
* Stop defining acpi_mp_config, it isn't used anywhere.
* Discard nested "#ifdef CONFIG_ACPI", they are useless and
  error-prone.

Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 4e83dd95

include/linux/acpi.h

+0 −14
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ 
#include <linux/dmi.h>





#ifdef CONFIG_ACPI



enum acpi_irq_model_id {

	ACPI_IRQ_MODEL_PIC = 0,

	ACPI_IRQ_MODEL_IOAPIC,
@@ -116,20 +114,12 @@ int acpi_unmap_lsapic(int cpu); 
int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base);

int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base);



extern int acpi_mp_config;



extern struct acpi_mcfg_allocation *pci_mmcfg_config;

extern int pci_mmcfg_config_num;



extern int sbf_port;

extern unsigned long acpi_realmode_flags;



#else	/* !CONFIG_ACPI */



#define acpi_mp_config	0



#endif 	/* !CONFIG_ACPI */



int acpi_register_gsi (u32 gsi, int triggering, int polarity);

int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
@@ -145,8 +135,6 @@ extern int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity); 
 */

void acpi_unregister_gsi (u32 gsi);



#ifdef CONFIG_ACPI



struct acpi_prt_entry {

	struct list_head	node;

	struct acpi_pci_id	id;
@@ -179,8 +167,6 @@ struct acpi_pci_driver { 
int acpi_pci_register_driver(struct acpi_pci_driver *driver);

void acpi_pci_unregister_driver(struct acpi_pci_driver *driver);



#endif /* CONFIG_ACPI */



#ifdef CONFIG_ACPI_EC



extern int ec_read(u8 addr, u8 *val);