Merge remote-tracking branch 'spi/fix/topcliff' into spi-linus

[~andy/linux] / drivers / i2c / busses / i2c-sirf.c

diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c
index e03381aee34f526cc8c8c66c67293fffdde97689..a63c7d50683676f5e01969573ffce373b3ce578f 100644 (file)
--- a/drivers/i2c/busses/i2c-sirf.c
+++ b/drivers/i2c/busses/i2c-sirf.c
@@ -303,16 +303,9 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
        adap->class = I2C_CLASS_HWMON;
 
        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (mem_res == NULL) {
-               dev_err(&pdev->dev, "Unable to get MEM resource\n");
-               err = -EINVAL;
-               goto out;
-       }
-
-       siic->base = devm_request_and_ioremap(&pdev->dev, mem_res);
-       if (siic->base == NULL) {
-               dev_err(&pdev->dev, "IO remap failed!\n");
-               err = -ENOMEM;
+       siic->base = devm_ioremap_resource(&pdev->dev, mem_res);
+       if (IS_ERR(siic->base)) {
+               err = PTR_ERR(siic->base);
                goto out;
        }