Commit 57f83e5d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

serial: 8250_dw: Use dev_err_probe()

Simplify the error path in ->probe() a bit by using dev_err_probe().
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220509172129.37770-2-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 295b0912
...@@ -497,18 +497,17 @@ static void dw8250_reset_control_assert(void *data) ...@@ -497,18 +497,17 @@ static void dw8250_reset_control_assert(void *data)
static int dw8250_probe(struct platform_device *pdev) static int dw8250_probe(struct platform_device *pdev)
{ {
struct uart_8250_port uart = {}, *up = &uart; struct uart_8250_port uart = {}, *up = &uart;
struct resource *regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct uart_port *p = &up->port; struct uart_port *p = &up->port;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dw8250_data *data; struct dw8250_data *data;
struct resource *regs;
int irq; int irq;
int err; int err;
u32 val; u32 val;
if (!regs) { regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dev_err(dev, "no registers defined\n"); if (!regs)
return -EINVAL; return dev_err_probe(dev, -EINVAL, "no registers defined\n");
}
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) if (irq < 0)
...@@ -593,7 +592,7 @@ static int dw8250_probe(struct platform_device *pdev) ...@@ -593,7 +592,7 @@ static int dw8250_probe(struct platform_device *pdev)
err = clk_prepare_enable(data->clk); err = clk_prepare_enable(data->clk);
if (err) if (err)
dev_warn(dev, "could not enable optional baudclk: %d\n", err); return dev_err_probe(dev, err, "could not enable optional baudclk\n");
err = devm_add_action_or_reset(dev, dw8250_clk_disable_unprepare, data->clk); err = devm_add_action_or_reset(dev, dw8250_clk_disable_unprepare, data->clk);
if (err) if (err)
...@@ -603,20 +602,16 @@ static int dw8250_probe(struct platform_device *pdev) ...@@ -603,20 +602,16 @@ static int dw8250_probe(struct platform_device *pdev)
p->uartclk = clk_get_rate(data->clk); p->uartclk = clk_get_rate(data->clk);
/* If no clock rate is defined, fail. */ /* If no clock rate is defined, fail. */
if (!p->uartclk) { if (!p->uartclk)
dev_err(dev, "clock rate not defined\n"); return dev_err_probe(dev, -EINVAL, "clock rate not defined\n");
return -EINVAL;
}
data->pclk = devm_clk_get_optional(dev, "apb_pclk"); data->pclk = devm_clk_get_optional(dev, "apb_pclk");
if (IS_ERR(data->pclk)) if (IS_ERR(data->pclk))
return PTR_ERR(data->pclk); return PTR_ERR(data->pclk);
err = clk_prepare_enable(data->pclk); err = clk_prepare_enable(data->pclk);
if (err) { if (err)
dev_err(dev, "could not enable apb_pclk\n"); return dev_err_probe(dev, err, "could not enable apb_pclk\n");
return err;
}
err = devm_add_action_or_reset(dev, dw8250_clk_disable_unprepare, data->pclk); err = devm_add_action_or_reset(dev, dw8250_clk_disable_unprepare, data->pclk);
if (err) if (err)
...@@ -660,8 +655,7 @@ static int dw8250_probe(struct platform_device *pdev) ...@@ -660,8 +655,7 @@ static int dw8250_probe(struct platform_device *pdev)
if (data->clk) { if (data->clk) {
err = clk_notifier_register(data->clk, &data->clk_notifier); err = clk_notifier_register(data->clk, &data->clk_notifier);
if (err) if (err)
dev_warn(p->dev, "Failed to set the clock notifier\n"); return dev_err_probe(dev, err, "Failed to set the clock notifier\n");
else
queue_work(system_unbound_wq, &data->clk_work); queue_work(system_unbound_wq, &data->clk_work);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment