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

Commit e5685b9d authored by Adrian Bunk's avatar Adrian Bunk Committed by Len Brown
Browse files

ACPI: misc cleanups 



    This patch contains the following possible cleanups:
    - make the following needlessly global code static:
      - drivers/acpi/bay.c:dev_attr_eject
      - drivers/acpi/bay.c:dev_attr_present
      - drivers/acpi/dock.c:dev_attr_docked
      - drivers/acpi/dock.c:dev_attr_flags
      - drivers/acpi/dock.c:dev_attr_uid
      - drivers/acpi/dock.c:dev_attr_undock
      - drivers/acpi/pci_bind.c:acpi_pci_unbind()
      - drivers/acpi/pci_link.c:acpi_link_lock
      - drivers/acpi/sbs.c:acpi_sbs_callback()
      - drivers/acpi/sbshc.c:acpi_smbus_transaction()
      - drivers/acpi/sleep/main.c:acpi_sleep_prepare()
    - #if 0 the following unused global functions:
      - drivers/acpi/numa.c:acpi_unmap_pxm_to_node()
    - remove the following unused EXPORT_SYMBOL's:
      - acpi_register_gsi
      - acpi_unregister_gsi
      - acpi_strict
      - acpi_bus_receive_event
      - register_acpi_bus_type
      - unregister_acpi_bus_type
      - acpi_os_printf
      - acpi_os_sleep
      - acpi_os_stall
      - acpi_os_read_pci_configuration
      - acpi_os_create_semaphore
      - acpi_os_delete_semaphore
      - acpi_os_wait_semaphore
      - acpi_os_signal_semaphore
      - acpi_os_signal
      - acpi_pci_irq_enable
      - acpi_get_pxm

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Acked-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 87ecd5cd

arch/ia64/kernel/acpi.c

+0 −4
Original line number Diff line number Diff line
@@ -601,8 +601,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity) 
				     IOSAPIC_LEVEL);

}



EXPORT_SYMBOL(acpi_register_gsi);



void acpi_unregister_gsi(u32 gsi)

{

	if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
@@ -611,8 +609,6 @@ void acpi_unregister_gsi(u32 gsi) 
	iosapic_unregister_intr(gsi);

}



EXPORT_SYMBOL(acpi_unregister_gsi);



static int __init acpi_parse_fadt(struct acpi_table_header *table)

{

	struct acpi_table_header *fadt_header;

arch/x86/kernel/acpi/boot.c

+0 −3
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ int acpi_ht __initdata = 1; /* enable HT */ 
int acpi_lapic;

int acpi_ioapic;

int acpi_strict;

EXPORT_SYMBOL(acpi_strict);



u8 acpi_sci_flags __initdata;

int acpi_sci_override_gsi __initdata;
@@ -490,8 +489,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity) 
	return irq;

}



EXPORT_SYMBOL(acpi_register_gsi);



/*

 *  ACPI based hotplug support for CPU

 */

drivers/acpi/bay.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static ssize_t show_present(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%d\n", bay_present(bay));



}

DEVICE_ATTR(present, S_IRUGO, show_present, NULL);

static DEVICE_ATTR(present, S_IRUGO, show_present, NULL);



/*

 * write_eject - write method for "eject" file in sysfs
@@ -144,7 +144,7 @@ static ssize_t write_eject(struct device *dev, struct device_attribute *attr, 
	eject_device(bay->handle);

	return count;

}

DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject);

static DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject);



/**

 * is_ata - see if a device is an ata device

drivers/acpi/bus.c

+0 −1
Original line number Diff line number Diff line
@@ -366,7 +366,6 @@ int acpi_bus_receive_event(struct acpi_bus_event *event) 
	return 0;

}



EXPORT_SYMBOL(acpi_bus_receive_event);

#endif	/* CONFIG_ACPI_PROC_EVENT */



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

drivers/acpi/dock.c

+4 −4
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ static ssize_t show_docked(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));



}

DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);

static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);



/*

 * show_flags - read method for flags file in sysfs
@@ -691,7 +691,7 @@ static ssize_t show_flags(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%d\n", dock_station->flags);



}

DEVICE_ATTR(flags, S_IRUGO, show_flags, NULL);

static DEVICE_ATTR(flags, S_IRUGO, show_flags, NULL);



/*

 * write_undock - write method for "undock" file in sysfs
@@ -707,7 +707,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr, 
	ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);

	return ret ? ret: count;

}

DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);

static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);



/*

 * show_dock_uid - read method for "uid" file in sysfs
@@ -723,7 +723,7 @@ static ssize_t show_dock_uid(struct device *dev, 


	return snprintf(buf, PAGE_SIZE, "%lx\n", lbuf);

}

DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);

static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);



/**

 * dock_add - add a new dock station