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

Commit 7ea816a0 authored by Michal Simek's avatar Michal Simek Committed by Greg Kroah-Hartman
Browse files

serial: Remove unnecessary amba_set_drvdata() 



Driver core clears the driver data to NULL after device_release
or on probe failure, so just remove it from here.

Driver core change:
"device-core: Ensure drvdata = NULL when no driver is bound"
(sha1: 0998d063)

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c49436b6

drivers/tty/serial/amba-pl010.c

+0 −3
Original line number Diff line number Diff line
@@ -728,7 +728,6 @@ static int pl010_probe(struct amba_device *dev, const struct amba_id *id) 
	amba_set_drvdata(dev, uap);

	ret = uart_add_one_port(&amba_reg, &uap->port);

	if (ret) {

		amba_set_drvdata(dev, NULL);

		amba_ports[i] = NULL;

		clk_put(uap->clk);

 unmap:
@@ -745,8 +744,6 @@ static int pl010_remove(struct amba_device *dev) 
	struct uart_amba_port *uap = amba_get_drvdata(dev);

	int i;



	amba_set_drvdata(dev, NULL);



	uart_remove_one_port(&amba_reg, &uap->port);



	for (i = 0; i < ARRAY_SIZE(amba_ports); i++)

drivers/tty/serial/amba-pl011.c

+0 −3
Original line number Diff line number Diff line
@@ -2147,7 +2147,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) 
	amba_set_drvdata(dev, uap);

	ret = uart_add_one_port(&amba_reg, &uap->port);

	if (ret) {

		amba_set_drvdata(dev, NULL);

		amba_ports[i] = NULL;

		pl011_dma_remove(uap);

	}
@@ -2160,8 +2159,6 @@ static int pl011_remove(struct amba_device *dev) 
	struct uart_amba_port *uap = amba_get_drvdata(dev);

	int i;



	amba_set_drvdata(dev, NULL);



	uart_remove_one_port(&amba_reg, &uap->port);



	for (i = 0; i < ARRAY_SIZE(amba_ports); i++)