Re: [PATCH 11/15] twl4030_charger: enable manual enable/disable of usb charging.

[Pavel Machek <pavel@ucw.cz>]

On Tue 2015-02-24 15:33:52, NeilBrown wrote:
> 'off' or 'auto' to
> 
>  /sys/class/power/twl4030_usb/mode
> 
> will now enable or disable charging from USB port.  Normally this is
> enabled on 'plug' and disabled on 'unplug'.
> Unplug will still disable charging.  'plug' will only enable it if
> 'auto' if selected.

This should go to Documentation/

> Signed-off-by: NeilBrown <neilb@suse.de>
> 
> Conflicts:
> 	drivers/power/twl4030_charger.c

Is it supposed to be here?

> diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
> index 01090a440583..19e8dbb1303e 100644
> --- a/drivers/power/twl4030_charger.c
> +++ b/drivers/power/twl4030_charger.c
> @@ -107,6 +107,9 @@ struct twl4030_bci {
>  	int			ichg_eoc, ichg_lo, ichg_hi;
>  	int			usb_cur, ac_cur;
>  	bool			ac_is_active;
> +	int			usb_mode; /* charging mode requested */
> +#define	CHARGE_OFF	0
> +#define	CHARGE_AUTO	1
>  
>  	unsigned long		event;
>  };
> @@ -377,6 +380,8 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable)
>  {
>  	int ret;
>  
n> +	if (bci->usb_mode == CHARGE_OFF)
> +		enable = false;

Sometimes, you use = false and sometimes = 0 when assigning to bools...

> @@ -629,6 +634,54 @@ static int twl4030_bci_usb_ncb(struct notifier_block *nb, unsigned long val,
>  	return NOTIFY_OK;
>  }
>  
> +/*
> + * sysfs charger enabled store
> + */
> +static char *modes[] = { "off", "auto" };

I'd move this before the comment. Or better near struct twl4030_bci.

> +static DEVICE_ATTR(mode, 0644, twl4030_bci_mode_show,
> +		   twl4030_bci_mode_store);
> +
>  static int twl4030_charger_get_current(void)
>  {
>  	int curr;
> @@ -799,6 +852,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
>  		bci->usb_cur = 500000;  /* 500mA */
>  	else
>  		bci->usb_cur = 100000;  /* 100mA */
> +	bci->usb_mode = CHARGE_AUTO;
>  
>  	bci->dev = &pdev->dev;
>  	bci->irq_chg = platform_get_irq(pdev, 0);
> @@ -885,6 +939,8 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
>  	twl4030_charger_update_current(bci);
>  	if (device_create_file(bci->usb.dev, &dev_attr_max_current))
>  		dev_warn(&pdev->dev, "could not create sysfs file\n");
> +	if (device_create_file(bci->usb.dev, &dev_attr_mode))
> +		dev_warn(&pdev->dev, "could not create sysfs file\n");
>  	if (device_create_file(bci->ac.dev, &dev_attr_max_current))
>  		dev_warn(&pdev->dev, "could not create sysfs file\n");
>  
> @@ -917,6 +973,7 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev)
>  
>  	device_remove_file(bci->usb.dev, &dev_attr_max_current);
>  	device_remove_file(bci->ac.dev, &dev_attr_max_current);
> +	device_remove_file(bci->usb.dev, &dev_attr_mode);

move the line above for consistency with create?

Acked-by: Pavel Machek <pavel@ucw.cz>
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html