Commit 8f41958b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/battery-2.6 

* git://git.infradead.org/battery-2.6:
  git-battery vs git-acpi
  Power supply class and drivers: remove non obligatory return statements
  pda_power: clean up irq, timer
  MAINTAINERS: Add maintainers for power supply subsystem and drivers

Fixed up trivial conflict in drivers/w1/slaves/w1_ds2760.c manually
parents bc06cffd 0909fca5

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -2869,6 +2869,16 @@ M: george@mvista.com 
L:	linux-kernel@vger.kernel.org

S:	Supported



POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS

P:	Anton Vorontsov

M:	cbou@mail.ru

P:	David Woodhouse

M:	dwmw2@infradead.org

L:	linux-kernel@vger.kernel.org

L:	kernel-discuss@handhelds.org

T:	git git.infradead.org/battery-2.6.git

S:	Maintained



POWERPC 4xx EMAC DRIVER

P:	Eugene Surovegin

M:	ebs@ebshome.net

drivers/power/apm_power.c

+0 −4
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ static void find_main_battery(void) 
	}

	if (!main_battery)

		main_battery = batm;



	return;

}



static int calculate_time(int status)
@@ -218,7 +216,6 @@ static void apm_battery_apm_get_power_status(struct apm_power_info *info) 
	}



	up(&power_supply_class->sem);

	return;

}



static int __init apm_battery_init(void)
@@ -232,7 +229,6 @@ static int __init apm_battery_init(void) 
static void __exit apm_battery_exit(void)

{

	apm_get_power_status = NULL;

	return;

}



module_init(apm_battery_init);

drivers/power/ds2760_battery.c

+0 −7
Original line number Diff line number Diff line
@@ -254,8 +254,6 @@ static void ds2760_battery_update_status(struct ds2760_device_info *di) 


	if (di->charge_status != old_charge_status)

		power_supply_changed(&di->bat);



	return;

}



static void ds2760_battery_work(struct work_struct *work)
@@ -268,8 +266,6 @@ static void ds2760_battery_work(struct work_struct *work) 


	ds2760_battery_update_status(di);

	queue_delayed_work(di->monitor_wqueue, &di->monitor_work, interval);



	return;

}



#define to_ds2760_device_info(x) container_of((x), struct ds2760_device_info, \
@@ -283,8 +279,6 @@ static void ds2760_battery_external_power_changed(struct power_supply *psy) 


	cancel_delayed_work(&di->monitor_work);

	queue_delayed_work(di->monitor_wqueue, &di->monitor_work, HZ/10);



	return;

}



static int ds2760_battery_get_property(struct power_supply *psy,
@@ -457,7 +451,6 @@ static int __init ds2760_battery_init(void) 
static void __exit ds2760_battery_exit(void)

{

	platform_driver_unregister(&ds2760_battery_driver);

	return;

}



module_init(ds2760_battery_init);

drivers/power/olpc_battery.c

+0 −1
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ static void __exit olpc_bat_exit(void) 
	power_supply_unregister(&olpc_bat);

	power_supply_unregister(&olpc_ac);

	platform_device_unregister(bat_pdev);

	return;

}



module_init(olpc_bat_init);

drivers/power/pda_power.c

+8 −14
Original line number Diff line number Diff line
@@ -97,36 +97,31 @@ static void update_charger(void) 
		dev_dbg(dev, "charger off\n");

		pdata->set_charge(0);

	}



	return;

}



static void supply_timer_func(unsigned long irq)

static void supply_timer_func(unsigned long power_supply_ptr)

{

	if (ac_irq && irq == ac_irq->start)

		power_supply_changed(&pda_power_supplies[0]);

	else if (usb_irq && irq == usb_irq->start)

		power_supply_changed(&pda_power_supplies[1]);

	return;

	void *power_supply = (void *)power_supply_ptr;



	power_supply_changed(power_supply);

}



static void charger_timer_func(unsigned long irq)

static void charger_timer_func(unsigned long power_supply_ptr)

{

	update_charger();



	/* Okay, charger set. Now wait a bit before notifying supplicants,

	 * charge power should stabilize. */

	supply_timer.data = irq;

	supply_timer.data = power_supply_ptr;

	mod_timer(&supply_timer,

		  jiffies + msecs_to_jiffies(pdata->wait_for_charger));

	return;

}



static irqreturn_t power_changed_isr(int irq, void *unused)

static irqreturn_t power_changed_isr(int irq, void *power_supply)

{

	/* Wait a bit before reading ac/usb line status and setting charger,

	 * because ac/usb status readings may lag from irq. */

	charger_timer.data = irq;

	charger_timer.data = (unsigned long)power_supply;

	mod_timer(&charger_timer,

		  jiffies + msecs_to_jiffies(pdata->wait_for_status));

	return IRQ_HANDLED;
@@ -252,7 +247,6 @@ static int __init pda_power_init(void) 
static void __exit pda_power_exit(void)

{

	platform_driver_unregister(&pda_power_pdrv);

	return;

}



module_init(pda_power_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE