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

Commit 87f0a427 authored by Jingoo Han's avatar Jingoo Han Committed by Greg Kroah-Hartman
Browse files

misc: arm-charlcd: remove unnecessary platform_set_drvdata() 



The driver core clears the driver data to NULL after device_release
or on probe failure, since commit 0998d063
(device-core: Ensure drvdata = NULL when no driver is bound).
Thus, it is not needed to manually clear the device driver data to NULL.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 21b066f1

drivers/misc/arm-charlcd.c

+1 −4
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static int __init charlcd_probe(struct platform_device *pdev) 
	lcd->virtbase = ioremap(lcd->phybase, lcd->physize);

	if (!lcd->virtbase) {

		ret = -ENOMEM;

		goto out_no_remap;

		goto out_no_memregion;

	}



	lcd->irq = platform_get_irq(pdev, 0);
@@ -320,8 +320,6 @@ static int __init charlcd_probe(struct platform_device *pdev) 


out_no_irq:

	iounmap(lcd->virtbase);

out_no_remap:

	platform_set_drvdata(pdev, NULL);

out_no_memregion:

	release_mem_region(lcd->phybase, SZ_4K);

out_no_resource:
@@ -337,7 +335,6 @@ static int __exit charlcd_remove(struct platform_device *pdev) 
		free_irq(lcd->irq, lcd);

		iounmap(lcd->virtbase);

		release_mem_region(lcd->phybase, lcd->physize);

		platform_set_drvdata(pdev, NULL);

		kfree(lcd);

	}