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

Commit 38e80121 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:
  PMU battery: filenames in sysfs with spaces
  pda_power: add init and exit function callbacks
parents e0986756 35bf5591

drivers/power/pda_power.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -209,6 +209,12 @@ static int pda_power_probe(struct platform_device *pdev) 




	pdata = pdev->dev.platform_data;

	pdata = pdev->dev.platform_data;





	if (pdata->init) {

		ret = pdata->init(dev);

		if (ret < 0)

			goto init_failed;

	}



	update_status();

	update_status();

	update_charger();

	update_charger();
@@ -298,6 +304,9 @@ static int pda_power_probe(struct platform_device *pdev) 
	if (pdata->is_ac_online)

	if (pdata->is_ac_online)

		power_supply_unregister(&pda_psy_ac);

		power_supply_unregister(&pda_psy_ac);

ac_supply_failed:

ac_supply_failed:

	if (pdata->exit)

		pdata->exit(dev);

init_failed:

wrongid:

wrongid:

	return ret;

	return ret;

}

}
@@ -318,6 +327,8 @@ static int pda_power_remove(struct platform_device *pdev) 
		power_supply_unregister(&pda_psy_usb);

		power_supply_unregister(&pda_psy_usb);

	if (pdata->is_ac_online)

	if (pdata->is_ac_online)

		power_supply_unregister(&pda_psy_ac);

		power_supply_unregister(&pda_psy_ac);

	if (pdata->exit)

		pdata->exit(dev);





	return 0;

	return 0;

}

}

drivers/power/pmu_battery.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -159,7 +159,7 @@ static int __init pmu_bat_init(void) 
		if (!pbat)

		if (!pbat)

			break;

			break;





		sprintf(pbat->name, "PMU battery %d", i);

		sprintf(pbat->name, "PMU_battery_%d", i);

		pbat->bat.name = pbat->name;

		pbat->bat.name = pbat->name;

		pbat->bat.properties = pmu_bat_props;

		pbat->bat.properties = pmu_bat_props;

		pbat->bat.num_properties = ARRAY_SIZE(pmu_bat_props);

		pbat->bat.num_properties = ARRAY_SIZE(pmu_bat_props);

include/linux/pda_power.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -16,10 +16,14 @@ 
#define PDA_POWER_CHARGE_AC  (1 << 0)

#define PDA_POWER_CHARGE_AC  (1 << 0)

#define PDA_POWER_CHARGE_USB (1 << 1)

#define PDA_POWER_CHARGE_USB (1 << 1)





struct device;



struct pda_power_pdata {

struct pda_power_pdata {

	int (*init)(struct device *dev);

	int (*is_ac_online)(void);

	int (*is_ac_online)(void);

	int (*is_usb_online)(void);

	int (*is_usb_online)(void);

	void (*set_charge)(int flags);

	void (*set_charge)(int flags);

	void (*exit)(struct device *dev);





	char **supplied_to;

	char **supplied_to;

	size_t num_supplicants;

	size_t num_supplicants;