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

Commit 635227ee authored by Len Brown's avatar Len Brown
Browse files

ACPI: remove function tracing macros from drivers/acpi/*.c 



a few invocations appeared due to the SBS and other patches.

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

drivers/acpi/cm_sbs.c

+5 −9
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ static int lock_battery_dir_cnt = 0; 


struct proc_dir_entry *acpi_lock_ac_dir(void)

{

	ACPI_FUNCTION_TRACE("acpi_lock_ac_dir");



	down(&cm_sbs_sem);

	if (!acpi_ac_dir) {
@@ -59,14 +58,13 @@ struct proc_dir_entry *acpi_lock_ac_dir(void) 
				  "Cannot create %s\n", ACPI_AC_CLASS));

	}

	up(&cm_sbs_sem);

	return (acpi_ac_dir);

	return acpi_ac_dir;

}



EXPORT_SYMBOL(acpi_lock_ac_dir);



void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir_param)

{

	ACPI_FUNCTION_TRACE("acpi_unlock_ac_dir");



	down(&cm_sbs_sem);

	if (acpi_ac_dir_param) {
@@ -83,7 +81,6 @@ EXPORT_SYMBOL(acpi_unlock_ac_dir); 


struct proc_dir_entry *acpi_lock_battery_dir(void)

{

	ACPI_FUNCTION_TRACE("acpi_lock_battery_dir");



	down(&cm_sbs_sem);

	if (!acpi_battery_dir) {
@@ -97,14 +94,13 @@ struct proc_dir_entry *acpi_lock_battery_dir(void) 
				  "Cannot create %s\n", ACPI_BATTERY_CLASS));

	}

	up(&cm_sbs_sem);

	return (acpi_battery_dir);

	return acpi_battery_dir;

}



EXPORT_SYMBOL(acpi_lock_battery_dir);



void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir_param)

{

	ACPI_FUNCTION_TRACE("acpi_unlock_battery_dir");



	down(&cm_sbs_sem);

	if (acpi_battery_dir_param) {
@@ -116,20 +112,20 @@ void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir_param) 
		acpi_battery_dir = 0;

	}

	up(&cm_sbs_sem);

	return;

}



EXPORT_SYMBOL(acpi_unlock_battery_dir);



static int __init acpi_cm_sbs_init(void)

{

	ACPI_FUNCTION_TRACE("acpi_cm_sbs_init");



	if (acpi_disabled)

		return_VALUE(0);

		return 0;



	init_MUTEX(&cm_sbs_sem);



	return_VALUE(0);

	return 0;

}



subsys_initcall(acpi_cm_sbs_init);

drivers/acpi/i2c_ec.c

+10 −24
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ static int acpi_ec_smb_read(struct acpi_ec_smbus *smbus, u8 address, u8 * data) 
	u8 val;

	int err;



	ACPI_FUNCTION_TRACE("acpi_ec_smb_read");



	err = ec_read(smbus->base + address, &val);

	if (!err) {

		*data = val;
@@ -129,8 +127,6 @@ static int acpi_ec_smb_write(struct acpi_ec_smbus *smbus, u8 address, u8 data) 
{

	int err;



	ACPI_FUNCTION_TRACE("acpi_ec_smb_write");



	err = ec_write(smbus->base + address, data);

	return (err);

}
@@ -144,8 +140,6 @@ acpi_ec_smb_access(struct i2c_adapter *adap, u16 addr, unsigned short flags, 
	unsigned char protocol, len = 0, pec, temp[2] = { 0, 0 };

	int i;



	ACPI_FUNCTION_TRACE("acpi_ec_smb_access");



	if (read_write == I2C_SMBUS_READ) {

		protocol = ACPI_EC_SMB_PRTCL_READ;

	} else {
@@ -290,7 +284,6 @@ acpi_ec_smb_access(struct i2c_adapter *adap, u16 addr, unsigned short flags, 


static u32 acpi_ec_smb_func(struct i2c_adapter *adapter)

{

	ACPI_FUNCTION_TRACE("acpi_ec_smb_func");



	return (I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |

		I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
@@ -312,22 +305,20 @@ static int acpi_ec_hc_add(struct acpi_device *device) 
	struct acpi_ec_hc *ec_hc;

	struct acpi_ec_smbus *smbus;



	ACPI_FUNCTION_TRACE("acpi_ec_hc_add");



	if (!device) {

		return_VALUE(-EINVAL);

		return -EINVAL;

	}



	ec_hc = kmalloc(sizeof(struct acpi_ec_hc), GFP_KERNEL);

	if (!ec_hc) {

		return_VALUE(-ENOMEM);

		return -ENOMEM;

	}

	memset(ec_hc, 0, sizeof(struct acpi_ec_hc));



	smbus = kmalloc(sizeof(struct acpi_ec_smbus), GFP_KERNEL);

	if (!smbus) {

		kfree(ec_hc);

		return_VALUE(-ENOMEM);

		return -ENOMEM;

	}

	memset(smbus, 0, sizeof(struct acpi_ec_smbus));
@@ -341,7 +332,7 @@ static int acpi_ec_hc_add(struct acpi_device *device) 
		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Error obtaining _EC\n"));

		kfree(ec_hc->smbus);

		kfree(smbus);

		return_VALUE(-EIO);

		return -EIO;

	}



	smbus->ec = acpi_driver_data(device->parent);
@@ -357,7 +348,7 @@ static int acpi_ec_hc_add(struct acpi_device *device) 
				  "EC SMBus adapter: Failed to register adapter\n"));

		kfree(smbus);

		kfree(ec_hc);

		return_VALUE(-EIO);

		return -EIO;

	}



	ec_hc->smbus = smbus;
@@ -365,17 +356,15 @@ static int acpi_ec_hc_add(struct acpi_device *device) 
	printk(KERN_INFO PREFIX "%s [%s]\n",

	       acpi_device_name(device), acpi_device_bid(device));



	return_VALUE(AE_OK);

	return AE_OK;

}



static int acpi_ec_hc_remove(struct acpi_device *device, int type)

{

	struct acpi_ec_hc *ec_hc;



	ACPI_FUNCTION_TRACE("acpi_ec_hc_remove");



	if (!device) {

		return_VALUE(-EINVAL);

		return -EINVAL;

	}

	ec_hc = acpi_driver_data(device);
@@ -383,30 +372,27 @@ static int acpi_ec_hc_remove(struct acpi_device *device, int type) 
	kfree(ec_hc->smbus);

	kfree(ec_hc);



	return_VALUE(AE_OK);

	return AE_OK;

}



static int __init acpi_ec_hc_init(void)

{

	int result;



	ACPI_FUNCTION_TRACE("acpi_ec_hc_init");

	result = acpi_bus_register_driver(&acpi_ec_hc_driver);

	if (result < 0) {

		return_VALUE(-ENODEV);

		return -ENODEV;

	}

	return_VALUE(0);

	return 0;

}



static void __exit acpi_ec_hc_exit(void)

{

	ACPI_FUNCTION_TRACE("acpi_ec_hc_exit");

	acpi_bus_unregister_driver(&acpi_ec_hc_driver);

}



struct acpi_ec_hc *acpi_get_ec_hc(struct acpi_device *device)

{

	ACPI_FUNCTION_TRACE("acpi_get_ec_hc");

	return ((struct acpi_ec_hc *)acpi_driver_data(device->parent));

}

drivers/acpi/numa.c

+1 −3
Original line number Diff line number Diff line
@@ -259,12 +259,10 @@ int acpi_get_node(acpi_handle *handle) 
{

	int pxm, node = -1;



	ACPI_FUNCTION_TRACE("acpi_get_node");



	pxm = acpi_get_pxm(handle);

	if (pxm >= 0)

		node = acpi_map_pxm_to_node(pxm);



	return_VALUE(node);

	return node;

}

EXPORT_SYMBOL(acpi_get_node);

drivers/acpi/sbs.c

+40 −102
Original line number Diff line number Diff line
@@ -187,8 +187,6 @@ static void acpi_battery_smbus_err_handler(struct acpi_ec_smbus *smbus) 
	char *err_str;

	int err_number;



	ACPI_FUNCTION_TRACE("acpi_battery_smbus_err_handler");



	data.word = 0;



	result = smbus->adapter.algo->
@@ -239,8 +237,6 @@ acpi_sbs_smbus_read_word(struct acpi_ec_smbus *smbus, int addr, int func, 
	int result = 0;

	int i;



	ACPI_FUNCTION_TRACE("acpi_sbs_smbus_read_word");



	if (err_handler == NULL) {

		err_handler = acpi_battery_smbus_err_handler;

	}
@@ -263,7 +259,7 @@ acpi_sbs_smbus_read_word(struct acpi_ec_smbus *smbus, int addr, int func, 
		}

	}



	return_VALUE(result);

	return result;

}



static int
@@ -275,8 +271,6 @@ acpi_sbs_smbus_read_str(struct acpi_ec_smbus *smbus, int addr, int func, 
	int result = 0;

	int i;



	ACPI_FUNCTION_TRACE("acpi_sbs_smbus_read_str");



	if (err_handler == NULL) {

		err_handler = acpi_battery_smbus_err_handler;

	}
@@ -302,7 +296,7 @@ acpi_sbs_smbus_read_str(struct acpi_ec_smbus *smbus, int addr, int func, 
		}

	}



	return_VALUE(result);

	return result;

}



static int
@@ -314,8 +308,6 @@ acpi_sbs_smbus_write_word(struct acpi_ec_smbus *smbus, int addr, int func, 
	int result = 0;

	int i;



	ACPI_FUNCTION_TRACE("acpi_sbs_smbus_write_word");



	if (err_handler == NULL) {

		err_handler = acpi_battery_smbus_err_handler;

	}
@@ -339,7 +331,7 @@ acpi_sbs_smbus_write_word(struct acpi_ec_smbus *smbus, int addr, int func, 
		}

	}



	return_VALUE(result);

	return result;

}



/* --------------------------------------------------------------------------
@@ -355,8 +347,6 @@ static int acpi_sbs_generate_event(struct acpi_device *device, 
	char class_saved[20];

	int result = 0;



	ACPI_FUNCTION_TRACE("acpi_sbs_generate_event");



	strcpy(bid_saved, acpi_device_bid(device));

	strcpy(class_saved, acpi_device_class(device));
@@ -368,7 +358,7 @@ static int acpi_sbs_generate_event(struct acpi_device *device, 
	strcpy(acpi_device_bid(device), bid_saved);

	strcpy(acpi_device_class(device), class_saved);



	return_VALUE(result);

	return result;

}



static int acpi_battery_get_present(struct acpi_battery *battery)
@@ -377,8 +367,6 @@ static int acpi_battery_get_present(struct acpi_battery *battery) 
	int result = 0;

	int is_present = 0;



	ACPI_FUNCTION_TRACE("acpi_battery_get_present");



	result = acpi_sbs_smbus_read_word(battery->sbs->smbus,

					  ACPI_SBSM_SMBUS_ADDR, 0x01,

					  &state, NULL);
@@ -391,7 +379,7 @@ static int acpi_battery_get_present(struct acpi_battery *battery) 
	}

	battery->battery_present = is_present;



	return_VALUE(result);

	return result;

}



static int acpi_battery_is_present(struct acpi_battery *battery)
@@ -411,8 +399,6 @@ static int acpi_battery_select(struct acpi_battery *battery) 
	s16 state;

	int foo;



	ACPI_FUNCTION_TRACE("acpi_battery_select");



	if (battery->sbs->sbsm_present) {



		/* Take special care not to knobble other nibbles of
@@ -440,7 +426,7 @@ static int acpi_battery_select(struct acpi_battery *battery) 
	}



      end:

	return_VALUE(result);

	return result;

}



static int acpi_sbsm_get_info(struct acpi_sbs *sbs)
@@ -449,8 +435,6 @@ static int acpi_sbsm_get_info(struct acpi_sbs *sbs) 
	int result = 0;

	s16 battery_system_info;



	ACPI_FUNCTION_TRACE("acpi_sbsm_get_info");



	result = acpi_sbs_smbus_read_word(smbus, ACPI_SBSM_SMBUS_ADDR, 0x04,

					  &battery_system_info, NULL);

	if (result) {
@@ -463,7 +447,7 @@ static int acpi_sbsm_get_info(struct acpi_sbs *sbs) 


      end:



	return_VALUE(result);

	return result;

}



static int acpi_battery_get_info(struct acpi_battery *battery)
@@ -473,8 +457,6 @@ static int acpi_battery_get_info(struct acpi_battery *battery) 
	s16 battery_mode;

	s16 specification_info;



	ACPI_FUNCTION_TRACE("acpi_battery_get_info");



	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x03,

					  &battery_mode,

					  &acpi_battery_smbus_err_handler);
@@ -583,12 +565,11 @@ static int acpi_battery_get_info(struct acpi_battery *battery) 
	}



      end:

	return_VALUE(result);

	return result;

}



static void acpi_update_delay(struct acpi_sbs *sbs)

{

	ACPI_FUNCTION_TRACE("acpi_update_delay");

	if (sbs->zombie) {

		return;

	}
@@ -602,8 +583,6 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
	struct acpi_ec_smbus *smbus = battery->sbs->smbus;

	int result = 0;



	ACPI_FUNCTION_TRACE("acpi_battery_get_state");



	acpi_update_delay(battery->sbs);

	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x09,

					  &battery->state.voltage,
@@ -667,7 +646,7 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
	acpi_update_delay(battery->sbs);



      end:

	return_VALUE(result);

	return result;

}



static int acpi_battery_get_alarm(struct acpi_battery *battery)
@@ -675,8 +654,6 @@ static int acpi_battery_get_alarm(struct acpi_battery *battery) 
	struct acpi_ec_smbus *smbus = battery->sbs->smbus;

	int result = 0;



	ACPI_FUNCTION_TRACE("acpi_battery_get_alarm");



	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x01,

					  &battery->alarm.remaining_capacity,

					  &acpi_battery_smbus_err_handler);
@@ -690,7 +667,7 @@ static int acpi_battery_get_alarm(struct acpi_battery *battery) 


      end:



	return_VALUE(result);

	return result;

}



static int acpi_battery_set_alarm(struct acpi_battery *battery,
@@ -701,8 +678,6 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery, 
	s16 battery_mode;

	int foo;



	ACPI_FUNCTION_TRACE("acpi_battery_set_alarm");



	result = acpi_battery_select(battery);

	if (result) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
@@ -746,7 +721,7 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery, 


      end:



	return_VALUE(result);

	return result;

}



static int acpi_battery_set_mode(struct acpi_battery *battery)
@@ -754,8 +729,6 @@ static int acpi_battery_set_mode(struct acpi_battery *battery) 
	int result = 0;

	s16 battery_mode;



	ACPI_FUNCTION_TRACE("acpi_battery_set_mode");



	if (capacity_mode == DEF_CAPACITY_UNIT) {

		goto end;

	}
@@ -793,15 +766,13 @@ static int acpi_battery_set_mode(struct acpi_battery *battery) 
	}



      end:

	return_VALUE(result);

	return result;

}



static int acpi_battery_init(struct acpi_battery *battery)

{

	int result = 0;



	ACPI_FUNCTION_TRACE("acpi_battery_init");



	result = acpi_battery_select(battery);

	if (result) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
@@ -838,7 +809,7 @@ static int acpi_battery_init(struct acpi_battery *battery) 
	}



      end:

	return_VALUE(result);

	return result;

}



static int acpi_ac_get_present(struct acpi_sbs *sbs)
@@ -847,8 +818,6 @@ static int acpi_ac_get_present(struct acpi_sbs *sbs) 
	int result = 0;

	s16 charger_status;



	ACPI_FUNCTION_TRACE("acpi_ac_get_present");



	result = acpi_sbs_smbus_read_word(smbus, ACPI_SBC_SMBUS_ADDR, 0x13,

					  &charger_status, NULL);
@@ -862,7 +831,7 @@ static int acpi_ac_get_present(struct acpi_sbs *sbs) 


      end:



	return_VALUE(result);

	return result;

}



/* --------------------------------------------------------------------------
@@ -881,14 +850,12 @@ acpi_sbs_generic_add_fs(struct proc_dir_entry **dir, 
{

	struct proc_dir_entry *entry = NULL;



	ACPI_FUNCTION_TRACE("acpi_sbs_generic_add_fs");



	if (!*dir) {

		*dir = proc_mkdir(dir_name, parent_dir);

		if (!*dir) {

			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

					  "proc_mkdir() failed\n"));

			return_VALUE(-ENODEV);

			return -ENODEV;

		}

		(*dir)->owner = THIS_MODULE;

	}
@@ -932,14 +899,13 @@ acpi_sbs_generic_add_fs(struct proc_dir_entry **dir, 
		}

	}



	return_VALUE(0);

	return 0;

}



static void

acpi_sbs_generic_remove_fs(struct proc_dir_entry **dir,

			   struct proc_dir_entry *parent_dir)

{

	ACPI_FUNCTION_TRACE("acpi_sbs_generic_remove_fs");



	if (*dir) {

		remove_proc_entry(ACPI_SBS_FILE_INFO, *dir);
@@ -961,10 +927,8 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset) 
	int cscale;

	int result = 0;



	ACPI_FUNCTION_TRACE("acpi_battery_read_info");



	if (battery->sbs->zombie) {

		return_VALUE(-ENODEV);

		return -ENODEV;

	}



	down(&sbs_sem);
@@ -1023,7 +987,7 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset) 


	up(&sbs_sem);



	return_VALUE(result);

	return result;

}



static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
@@ -1038,10 +1002,8 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset) 
	int cscale;

	int foo;



	ACPI_FUNCTION_TRACE("acpi_battery_read_state");



	if (battery->sbs->zombie) {

		return_VALUE(-ENODEV);

		return -ENODEV;

	}



	down(&sbs_sem);
@@ -1104,7 +1066,7 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset) 


	up(&sbs_sem);



	return_VALUE(result);

	return result;

}



static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
@@ -1118,10 +1080,8 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset) 
	int result = 0;

	int cscale;



	ACPI_FUNCTION_TRACE("acpi_battery_read_alarm");



	if (battery->sbs->zombie) {

		return_VALUE(-ENODEV);

		return -ENODEV;

	}



	down(&sbs_sem);
@@ -1158,7 +1118,7 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset) 


	up(&sbs_sem);



	return_VALUE(result);

	return result;

}



static ssize_t
@@ -1170,10 +1130,8 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer, 
	char alarm_string[12] = { '\0' };

	int result, old_alarm, new_alarm;



	ACPI_FUNCTION_TRACE("acpi_battery_write_alarm");



	if (battery->sbs->zombie) {

		return_VALUE(-ENODEV);

		return -ENODEV;

	}



	down(&sbs_sem);
@@ -1217,9 +1175,9 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer, 
	up(&sbs_sem);



	if (result) {

		return_VALUE(result);

		return result;

	} else {

		return_VALUE(count);

		return count;

	}

}
@@ -1262,10 +1220,8 @@ static int acpi_ac_read_state(struct seq_file *seq, void *offset) 
	struct acpi_sbs *sbs = (struct acpi_sbs *)seq->private;

	int result;



	ACPI_FUNCTION_TRACE("acpi_ac_read_state");



	if (sbs->zombie) {

		return_VALUE(-ENODEV);

		return -ENODEV;

	}



	down(&sbs_sem);
@@ -1283,7 +1239,7 @@ static int acpi_ac_read_state(struct seq_file *seq, void *offset) 


	up(&sbs_sem);



	return_VALUE(0);

	return 0;

}



static int acpi_ac_state_open_fs(struct inode *inode, struct file *file)
@@ -1312,8 +1268,6 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) 
	char dir_name[32];

	struct acpi_battery *battery;



	ACPI_FUNCTION_TRACE("acpi_battery_add");



	battery = &sbs->battery[id];



	battery->alive = 0;
@@ -1364,12 +1318,11 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) 
	battery->alive = 1;



      end:

	return_VALUE(result);

	return result;

}



static void acpi_battery_remove(struct acpi_sbs *sbs, int id)

{

	ACPI_FUNCTION_TRACE("acpi_battery_remove");



	if (sbs->battery[id].battery_entry) {

		acpi_sbs_generic_remove_fs(&(sbs->battery[id].battery_entry),
@@ -1381,8 +1334,6 @@ static int acpi_ac_add(struct acpi_sbs *sbs) 
{

	int result;



	ACPI_FUNCTION_TRACE("acpi_ac_add");



	result = acpi_ac_get_present(sbs);

	if (result) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
@@ -1402,12 +1353,11 @@ static int acpi_ac_add(struct acpi_sbs *sbs) 


      end:



	return_VALUE(result);

	return result;

}



static void acpi_ac_remove(struct acpi_sbs *sbs)

{

	ACPI_FUNCTION_TRACE("acpi_ac_remove");



	if (sbs->ac_entry) {

		acpi_sbs_generic_remove_fs(&sbs->ac_entry, acpi_ac_dir);
@@ -1416,7 +1366,6 @@ static void acpi_ac_remove(struct acpi_sbs *sbs) 


static void acpi_sbs_update_queue_run(unsigned long data)

{

	ACPI_FUNCTION_TRACE("acpi_sbs_update_queue_run");

	acpi_os_execute(OSL_GPE_HANDLER, acpi_sbs_update_queue, (void *)data);

}
@@ -1433,8 +1382,6 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type) 
	int do_battery_init, do_ac_init;

	s16 old_remaining_capacity;



	ACPI_FUNCTION_TRACE("acpi_sbs_update_run");



	if (sbs->zombie) {

		goto end;

	}
@@ -1584,7 +1531,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type) 
	}



      end:

	return_VALUE(result);

	return result;

}



static void acpi_sbs_update_queue(void *data)
@@ -1593,8 +1540,6 @@ static void acpi_sbs_update_queue(void *data) 
	unsigned long delay = -1;

	int result;



	ACPI_FUNCTION_TRACE("acpi_sbs_update_queue");



	if (sbs->zombie) {

		goto end;

	}
@@ -1631,12 +1576,10 @@ static int acpi_sbs_add(struct acpi_device *device) 
	int id, cnt;

	acpi_status status = AE_OK;



	ACPI_FUNCTION_TRACE("acpi_sbs_add");



	sbs = kmalloc(sizeof(struct acpi_sbs), GFP_KERNEL);

	if (!sbs) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "kmalloc() failed\n"));

		return_VALUE(-ENOMEM);

		return -ENOMEM;

	}

	memset(sbs, 0, sizeof(struct acpi_sbs));
@@ -1737,7 +1680,7 @@ static int acpi_sbs_add(struct acpi_device *device) 
		}

	}



	return_VALUE(result);

	return result;

}



int acpi_sbs_remove(struct acpi_device *device, int type)
@@ -1745,10 +1688,8 @@ int acpi_sbs_remove(struct acpi_device *device, int type) 
	struct acpi_sbs *sbs = (struct acpi_sbs *)acpi_driver_data(device);

	int id;



	ACPI_FUNCTION_TRACE("acpi_sbs_remove");



	if (!device || !sbs) {

		return_VALUE(-EINVAL);

		return -EINVAL;

	}



	sbs->zombie = 1;
@@ -1766,15 +1707,13 @@ int acpi_sbs_remove(struct acpi_device *device, int type) 


	kfree(sbs);



	return_VALUE(0);

	return 0;

}



static int __init acpi_sbs_init(void)

{

	int result = 0;



	ACPI_FUNCTION_TRACE("acpi_sbs_init");



	init_MUTEX(&sbs_sem);



	if (capacity_mode != DEF_CAPACITY_UNIT
@@ -1783,36 +1722,35 @@ static int __init acpi_sbs_init(void) 
		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "acpi_sbs_init: "

				  "invalid capacity_mode = %d\n",

				  capacity_mode));

		return_VALUE(-EINVAL);

		return -EINVAL;

	}



	acpi_ac_dir = acpi_lock_ac_dir();

	if (!acpi_ac_dir) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

				  "acpi_lock_ac_dir() failed\n"));

		return_VALUE(-ENODEV);

		return -ENODEV;

	}



	acpi_battery_dir = acpi_lock_battery_dir();

	if (!acpi_battery_dir) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

				  "acpi_lock_battery_dir() failed\n"));

		return_VALUE(-ENODEV);

		return -ENODEV;

	}



	result = acpi_bus_register_driver(&acpi_sbs_driver);

	if (result < 0) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

				  "acpi_bus_register_driver() failed\n"));

		return_VALUE(-ENODEV);

		return -ENODEV;

	}



	return_VALUE(0);

	return 0;

}



static void __exit acpi_sbs_exit(void)

{

	ACPI_FUNCTION_TRACE("acpi_sbs_exit");



	acpi_bus_unregister_driver(&acpi_sbs_driver);
@@ -1821,7 +1759,7 @@ static void __exit acpi_sbs_exit(void) 
	acpi_unlock_battery_dir(acpi_battery_dir);

	acpi_battery_dir = NULL;



	return_VOID;

	return;

}



module_init(acpi_sbs_init);