Re: [PATCH] Input: opencores-kbd: Switch to using managed resources

[Tobias Klauser]

On 2014-10-07 at 13:31:41 +0200, Pramod Gurav <pramod.gurav@xxxxxxxxxxxxxxx> wrote:
> This change switch to managed resources to simplifies error handling
> and module unloading and does away with platform_driver remove function.
> 
> Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> Cc: linux-input@xxxxxxxxxxxxxxx
> Signed-off-by: Pramod Gurav <pramod.gurav@xxxxxxxxxxxxxxx>
> ---
>  drivers/input/keyboard/opencores-kbd.c |   54 ++++++++------------------------
>  1 file changed, 13 insertions(+), 41 deletions(-)
> 
> diff --git a/drivers/input/keyboard/opencores-kbd.c b/drivers/input/keyboard/opencores-kbd.c
> index 7b9b441..ecacb87 100644
> --- a/drivers/input/keyboard/opencores-kbd.c
> +++ b/drivers/input/keyboard/opencores-kbd.c
> @@ -56,27 +56,27 @@ static int opencores_kbd_probe(struct platform_device *pdev)
>  		return -EINVAL;
>  	}
>  
> -	opencores_kbd = kzalloc(sizeof(*opencores_kbd), GFP_KERNEL);
> -	input = input_allocate_device();
> +	opencores_kbd = devm_kzalloc(&pdev->dev, sizeof(*opencores_kbd),
> +				     GFP_KERNEL);
> +	input = devm_input_allocate_device(&pdev->dev);
>  	if (!opencores_kbd || !input) {
>  		dev_err(&pdev->dev, "failed to allocate device structures\n");
> -		error = -ENOMEM;
> -		goto err_free_mem;
> +		return -ENOMEM;
>  	}
>  
>  	opencores_kbd->addr_res = res;
> -	res = request_mem_region(res->start, resource_size(res), pdev->name);
> +	res = devm_request_mem_region(&pdev->dev, res->start,
> +				      resource_size(res), pdev->name);
>  	if (!res) {
>  		dev_err(&pdev->dev, "failed to request I/O memory\n");
> -		error = -EBUSY;
> -		goto err_free_mem;
> +		return -EBUSY;
>  	}
>  
> -	opencores_kbd->addr = ioremap(res->start, resource_size(res));
> +	opencores_kbd->addr = devm_ioremap(&pdev->dev, res->start,
> +					   resource_size(res));

You could use devm_ioremap_resource() here and get rid of the call to
devm_request_mem_region() and the check for !res above, i.e. something
like:

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
	[...]
	opencores_kbd->addr = devm_ioremap_resource(&pdev->dev, res);
	if (!opencores_kbd->addr) {
		dev_err(&pdev->dev, "failed to remap I/O memory\n");
		return -ENXIO;
	}

>  	if (!opencores_kbd->addr) {
>  		dev_err(&pdev->dev, "failed to remap I/O memory\n");
> -		error = -ENXIO;
> -		goto err_rel_mem;
> +		return -ENXIO;
>  	}
>  
>  	opencores_kbd->input = input;
> @@ -109,54 +109,26 @@ static int opencores_kbd_probe(struct platform_device *pdev)
>  	}
>  	__clear_bit(KEY_RESERVED, input->keybit);
>  
> -	error = request_irq(irq, &opencores_kbd_isr,
> +	error = devm_request_irq(&pdev->dev, irq, &opencores_kbd_isr,
>  			    IRQF_TRIGGER_RISING, pdev->name, opencores_kbd);

The second line should be aligned to the opening parenthesis:

	error = devm_request_irq(&pdev->dev, irq, &opencores_kbd_isr,
				 IRQF_TRIGGER_RISING, pdev->name, opencores_kbd);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/