Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
spi: pxa2xx: Switch to use dev_err_probe()
Switch to use dev_err_probe() to simplify the error path and
unify a message template.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://msgid.link/r/20240326181027.1418989-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Andy Shevchenko
and committed by
Mark Brown
d5449432
dad983d8
+7
-12
+7
-12
drivers/spi/spi-pxa2xx.c
+7
-12
drivers/spi/spi-pxa2xx.c
···
1435
1435
platform_info = dev_get_platdata(dev);
1436
1436
if (!platform_info) {
1437
1437
platform_info = pxa2xx_spi_init_pdata(pdev);
1438
-
if (IS_ERR(platform_info)) {
1439
-
dev_err(&pdev->dev, "missing platform data\n");
1440
-
return PTR_ERR(platform_info);
1441
-
}
1438
+
if (IS_ERR(platform_info))
1439
+
return dev_err_probe(dev, PTR_ERR(platform_info), "missing platform data\n");
1442
1440
}
1443
1441
1444
1442
ssp = pxa_ssp_request(pdev->id, pdev->name);
1445
1443
if (!ssp)
1446
1444
ssp = &platform_info->ssp;
1447
1445
1448
-
if (!ssp->mmio_base) {
1449
-
dev_err(&pdev->dev, "failed to get SSP\n");
1450
-
return -ENODEV;
1451
-
}
1446
+
if (!ssp->mmio_base)
1447
+
return dev_err_probe(dev, -ENODEV, "failed to get SSP\n");
1452
1448
1453
1449
if (platform_info->is_target)
1454
1450
controller = devm_spi_alloc_target(dev, sizeof(*drv_data));
···
1452
1456
controller = devm_spi_alloc_host(dev, sizeof(*drv_data));
1453
1457
1454
1458
if (!controller) {
1455
-
dev_err(&pdev->dev, "cannot alloc spi_controller\n");
1456
-
status = -ENOMEM;
1459
+
status = dev_err_probe(dev, -ENOMEM, "cannot alloc spi_controller\n");
1457
1460
goto out_error_controller_alloc;
1458
1461
}
1459
1462
drv_data = spi_controller_get_devdata(controller);
···
1506
1511
status = request_irq(ssp->irq, ssp_int, IRQF_SHARED, dev_name(dev),
1507
1512
drv_data);
1508
1513
if (status < 0) {
1509
-
dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq);
1514
+
dev_err_probe(dev, status, "cannot get IRQ %d\n", ssp->irq);
1510
1515
goto out_error_controller_alloc;
1511
1516
}
1512
1517
···
1622
1627
platform_set_drvdata(pdev, drv_data);
1623
1628
status = spi_register_controller(controller);
1624
1629
if (status) {
1625
-
dev_err(&pdev->dev, "problem registering SPI controller\n");
1630
+
dev_err_probe(dev, status, "problem registering SPI controller\n");
1626
1631
goto out_error_pm_runtime_enabled;
1627
1632
}
1628
1633