platform/x86: i2c-multi-instantiate: Simplify with dev_err_probe()

[linux-2.6-microblaze.git] / drivers / platform / x86 / i2c-multi-instantiate.c

diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c
index 6acc845..ce4d921 100644 (file)
--- a/drivers/platform/x86/i2c-multi-instantiate.c
+++ b/drivers/platform/x86/i2c-multi-instantiate.c
@@ -118,9 +118,8 @@ static int i2c_multi_inst_probe(struct platform_device *pdev)
                }
                multi->clients[i] = i2c_acpi_new_device(dev, i, &board_info);
                if (IS_ERR(multi->clients[i])) {
-                       ret = PTR_ERR(multi->clients[i]);
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(dev, "Error creating i2c-client, idx %d\n", i);
+                       ret = dev_err_probe(dev, PTR_ERR(multi->clients[i]),
+                                           "Error creating i2c-client, idx %d\n", i);
                        goto error;
                }
        }
@@ -189,7 +188,7 @@ MODULE_DEVICE_TABLE(acpi, i2c_multi_inst_acpi_ids);
 static struct platform_driver i2c_multi_inst_driver = {
        .driver = {
                .name = "I2C multi instantiate pseudo device driver",
-               .acpi_match_table = ACPI_PTR(i2c_multi_inst_acpi_ids),
+               .acpi_match_table = i2c_multi_inst_acpi_ids,
        },
        .probe = i2c_multi_inst_probe,
        .remove = i2c_multi_inst_remove,