Commit 167bf09e authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Greg Kroah-Hartman
Browse files

staging: nvec: Convert to use devm_input_allocate 



nvec_kbd is converted to use devm_input_allocate.
This simplifies error handling and remove path.

Signed-off-by: default avatarLeon Romanovsky <leon@leon.nu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e763f7b

drivers/staging/nvec/nvec_kbd.c

+2 −8
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int nvec_kbd_probe(struct platform_device *pdev) 
	for (i = 0; i < ARRAY_SIZE(extcode_tab_us102); ++i)

		keycodes[j++] = extcode_tab_us102[i];



	idev = input_allocate_device();

	idev = devm_input_allocate_device(&pdev->dev);

	idev->name = "nvec keyboard";

	idev->phys = "nvec";

	idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP) | BIT_MASK(EV_LED);
@@ -142,7 +142,7 @@ static int nvec_kbd_probe(struct platform_device *pdev) 
	clear_bit(0, idev->keybit);

	err = input_register_device(idev);

	if (err)

		goto fail;

		return err;



	keys_dev.input = idev;

	keys_dev.notifier.notifier_call = nvec_keys_notifier;
@@ -161,10 +161,6 @@ static int nvec_kbd_probe(struct platform_device *pdev) 
	nvec_write_async(nvec, clear_leds, sizeof(clear_leds));



	return 0;



fail:

	input_free_device(idev);

	return err;

}



static int nvec_kbd_remove(struct platform_device *pdev)
@@ -177,8 +173,6 @@ static int nvec_kbd_remove(struct platform_device *pdev) 
	nvec_write_async(nvec, disable_kbd, 2);

	nvec_unregister_notifier(nvec, &keys_dev.notifier);



	input_unregister_device(keys_dev.input);



	return 0;

}