Commit a2279547 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: dm355evm_keys - remove use of sparse_keymap_free



Now that sparse keymap uses managed memory, we no longer need to clean it
up manually.

Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 7b179e25
Loading
Loading
Loading
Loading
+3 −6
Original line number Original line Diff line number Diff line
@@ -213,21 +213,19 @@ static int dm355evm_keys_probe(struct platform_device *pdev)
				      IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
				      IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
				      dev_name(&pdev->dev), keys);
				      dev_name(&pdev->dev), keys);
	if (status < 0)
	if (status < 0)
		goto fail2;
		goto fail1;


	/* register */
	/* register */
	status = input_register_device(input);
	status = input_register_device(input);
	if (status < 0)
	if (status < 0)
		goto fail3;
		goto fail2;


	platform_set_drvdata(pdev, keys);
	platform_set_drvdata(pdev, keys);


	return 0;
	return 0;


fail3:
	free_irq(keys->irq, keys);
fail2:
fail2:
	sparse_keymap_free(input);
	free_irq(keys->irq, keys);
fail1:
fail1:
	input_free_device(input);
	input_free_device(input);
	kfree(keys);
	kfree(keys);
@@ -241,7 +239,6 @@ static int dm355evm_keys_remove(struct platform_device *pdev)
	struct dm355evm_keys	*keys = platform_get_drvdata(pdev);
	struct dm355evm_keys	*keys = platform_get_drvdata(pdev);


	free_irq(keys->irq, keys);
	free_irq(keys->irq, keys);
	sparse_keymap_free(keys->input);
	input_unregister_device(keys->input);
	input_unregister_device(keys->input);
	kfree(keys);
	kfree(keys);