Commit 6b5f1e2e authored by Biju Das's avatar Biju Das Committed by Greg Kroah-Hartman
Browse files

serial: 8250_em: Simplify probe() 



Simplify probe() by using dev_err_probe() instead of dev_err() and
add a local variable 'dev' to replace '&pdev->dev'.

Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230227114152.22265-3-biju.das.jz@bp.renesas.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 302a22a4

drivers/tty/serial/8250/8250_em.c

+9 −13
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static void serial8250_em_serial_dl_write(struct uart_8250_port *up, int value) 
static int serial8250_em_probe(struct platform_device *pdev)

{

	struct serial8250_em_priv *priv;

	struct device *dev = &pdev->dev;

	struct uart_8250_port up;

	struct resource *regs;

	int irq, ret;
@@ -88,27 +89,23 @@ static int serial8250_em_probe(struct platform_device *pdev) 
		return irq;



	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!regs) {

		dev_err(&pdev->dev, "missing registers\n");

		return -EINVAL;

	}

	if (!regs)

		return dev_err_probe(dev, -EINVAL, "missing registers\n");



	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	priv->sclk = devm_clk_get(&pdev->dev, "sclk");

	if (IS_ERR(priv->sclk)) {

		dev_err(&pdev->dev, "unable to get clock\n");

		return PTR_ERR(priv->sclk);

	}

	priv->sclk = devm_clk_get(dev, "sclk");

	if (IS_ERR(priv->sclk))

		return dev_err_probe(dev, PTR_ERR(priv->sclk), "unable to get clock\n");



	memset(&up, 0, sizeof(up));

	up.port.mapbase = regs->start;

	up.port.irq = irq;

	up.port.type = PORT_16750;

	up.port.flags = UPF_FIXED_PORT | UPF_IOREMAP | UPF_FIXED_TYPE;

	up.port.dev = &pdev->dev;

	up.port.dev = dev;

	up.port.private_data = priv;



	clk_prepare_enable(priv->sclk);
@@ -122,9 +119,8 @@ static int serial8250_em_probe(struct platform_device *pdev) 


	ret = serial8250_register_8250_port(&up);

	if (ret < 0) {

		dev_err(&pdev->dev, "unable to register 8250 port\n");

		clk_disable_unprepare(priv->sclk);

		return ret;

		return dev_err_probe(dev, ret, "unable to register 8250 port\n");

	}



	priv->line = ret;