Commit 7cda93e0 authored by Len Brown's avatar Len Brown
Browse files

ACPI: delete extra #defines in /drivers/acpi/ drivers 



Cosmetic only.

Except in a single case, #define ACPI_*_DRIVER_NAME
were invoked 0 or 1 times.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c2b6705b

drivers/acpi/ac.c

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#define ACPI_AC_COMPONENT		0x00020000

#define ACPI_AC_CLASS			"ac_adapter"

#define ACPI_AC_HID 			"ACPI0003"

#define ACPI_AC_DRIVER_NAME		"ACPI AC Adapter Driver"

#define ACPI_AC_DEVICE_NAME		"AC Adapter"

#define ACPI_AC_FILE_STATE		"state"

#define ACPI_AC_NOTIFY_STATUS		0x80
@@ -47,7 +46,7 @@ 
ACPI_MODULE_NAME("ac");



MODULE_AUTHOR("Paul Diefenbaugh");

MODULE_DESCRIPTION(ACPI_AC_DRIVER_NAME);

MODULE_DESCRIPTION("ACPI AC Adapter Driver");

MODULE_LICENSE("GPL");



extern struct proc_dir_entry *acpi_lock_ac_dir(void);

drivers/acpi/acpi_memhotplug.c

+1 −2
Original line number Diff line number Diff line
@@ -35,14 +35,13 @@ 
#define ACPI_MEMORY_DEVICE_COMPONENT		0x08000000UL

#define ACPI_MEMORY_DEVICE_CLASS		"memory"

#define ACPI_MEMORY_DEVICE_HID			"PNP0C80"

#define ACPI_MEMORY_DEVICE_DRIVER_NAME		"Hotplug Mem Driver"

#define ACPI_MEMORY_DEVICE_NAME			"Hotplug Mem Device"



#define _COMPONENT		ACPI_MEMORY_DEVICE_COMPONENT



ACPI_MODULE_NAME("acpi_memhotplug");

MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>");

MODULE_DESCRIPTION(ACPI_MEMORY_DEVICE_DRIVER_NAME);

MODULE_DESCRIPTION("Hotplug Mem Driver");

MODULE_LICENSE("GPL");



/* ACPI _STA method values */

drivers/acpi/battery.c

+1 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#define ACPI_BATTERY_COMPONENT		0x00040000

#define ACPI_BATTERY_CLASS		"battery"

#define ACPI_BATTERY_HID		"PNP0C0A"

#define ACPI_BATTERY_DRIVER_NAME	"ACPI Battery Driver"

#define ACPI_BATTERY_DEVICE_NAME	"Battery"

#define ACPI_BATTERY_FILE_INFO		"info"

#define ACPI_BATTERY_FILE_STATUS	"state"
@@ -56,7 +55,7 @@ 
ACPI_MODULE_NAME("battery");



MODULE_AUTHOR("Paul Diefenbaugh");

MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME);

MODULE_DESCRIPTION("ACPI Battery Driver");

MODULE_LICENSE("GPL");



extern struct proc_dir_entry *acpi_lock_battery_dir(void);

drivers/acpi/bay.c

+1 −3
Original line number Diff line number Diff line
@@ -32,11 +32,9 @@ 
#include <asm/uaccess.h>

#include <linux/platform_device.h>



#define ACPI_BAY_DRIVER_NAME "ACPI Removable Drive Bay Driver"



ACPI_MODULE_NAME("bay");

MODULE_AUTHOR("Kristen Carlson Accardi");

MODULE_DESCRIPTION(ACPI_BAY_DRIVER_NAME);

MODULE_DESCRIPTION("ACPI Removable Drive Bay Driver");

MODULE_LICENSE("GPL");

#define ACPI_BAY_CLASS "bay"

#define ACPI_BAY_COMPONENT	0x10000000

drivers/acpi/button.c

+1 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <acpi/acpi_drivers.h>



#define ACPI_BUTTON_COMPONENT		0x00080000

#define ACPI_BUTTON_DRIVER_NAME		"ACPI Button Driver"

#define ACPI_BUTTON_CLASS		"button"

#define ACPI_BUTTON_FILE_INFO		"info"

#define ACPI_BUTTON_FILE_STATE		"state"
@@ -64,7 +63,7 @@ 
ACPI_MODULE_NAME("button");



MODULE_AUTHOR("Paul Diefenbaugh");

MODULE_DESCRIPTION(ACPI_BUTTON_DRIVER_NAME);

MODULE_DESCRIPTION("ACPI Button Driver");

MODULE_LICENSE("GPL");



static int acpi_button_add(struct acpi_device *device);