tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

serial: 8250_bcm7271: Use dev_err_probe() instead of dev_err()

Make the error messages format unified by switching to use
dev_err_probe() where it makes sense.

This also helps simplifing the code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20230918103648.1185663-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Andy Shevchenko and committed by
Greg Kroah-Hartman c77247a5 45a1c8df

+7 -10
+7 -10
drivers/tty/serial/8250/8250_bcm7271.c
··· 984 984 } 985 985 986 986 /* We should have just the uart base registers or all the registers */ 987 - if (x != 1 && x != REGS_MAX) { 988 - dev_warn(dev, "%s registers not specified\n", reg_names[x]); 989 - return -EINVAL; 990 - } 987 + if (x != 1 && x != REGS_MAX) 988 + return dev_err_probe(dev, -EINVAL, "%s registers not specified\n", 989 + reg_names[x]); 991 990 992 991 /* if the DMA registers were specified, try to enable DMA */ 993 992 if (x > REGS_DMA_RX) { ··· 1033 1034 } 1034 1035 1035 1036 if (clk_rate == 0) { 1036 - dev_err(dev, "clock-frequency or clk not defined\n"); 1037 - ret = -EINVAL; 1037 + ret = dev_err_probe(dev, -EINVAL, "clock-frequency or clk not defined\n"); 1038 1038 goto err_clk_disable; 1039 1039 } 1040 1040 ··· 1091 1093 1092 1094 ret = serial8250_register_8250_port(&up); 1093 1095 if (ret < 0) { 1094 - dev_err(dev, "unable to register 8250 port\n"); 1096 + dev_err_probe(dev, ret, "unable to register 8250 port\n"); 1095 1097 goto err; 1096 1098 } 1097 1099 priv->line = ret; ··· 1100 1102 if (priv->dma_enabled) { 1101 1103 dma_irq = platform_get_irq_byname(pdev, "dma"); 1102 1104 if (dma_irq < 0) { 1103 - ret = dma_irq; 1104 - dev_err(dev, "no IRQ resource info\n"); 1105 + ret = dev_err_probe(dev, dma_irq, "no IRQ resource info\n"); 1105 1106 goto err1; 1106 1107 } 1107 1108 ret = devm_request_irq(dev, dma_irq, brcmuart_isr, 1108 1109 IRQF_SHARED, "uart DMA irq", &new_port->port); 1109 1110 if (ret) { 1110 - dev_err(dev, "unable to register IRQ handler\n"); 1111 + dev_err_probe(dev, ret, "unable to register IRQ handler\n"); 1111 1112 goto err1; 1112 1113 } 1113 1114 }