i2c: remove unnecessary OOM messages

The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message. For example,
k.alloc and v.alloc failures use dump_stack().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index c607195..214ff97 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -225,10 +225,8 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
        struct i2c_adapter *adap;
 
        i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
-       if (!i2c_dev) {
-               dev_err(&pdev->dev, "Cannot allocate i2c_dev\n");
+       if (!i2c_dev)
                return -ENOMEM;
-       }
        platform_set_drvdata(pdev, i2c_dev);
        i2c_dev->dev = &pdev->dev;
        init_completion(&i2c_dev->completion);

diff --cc drivers/i2c/busses/i2c-diolan-u2c.c
Simple merge

diff --cc drivers/i2c/busses/i2c-efm32.c
Simple merge

diff --cc drivers/i2c/busses/i2c-eg20t.c
Simple merge

diff --cc drivers/i2c/busses/i2c-exynos5.c
Simple merge

diff --cc drivers/i2c/busses/i2c-imx.c
Simple merge

diff --cc drivers/i2c/busses/i2c-omap.c
Simple merge

diff --cc drivers/i2c/busses/i2c-rcar.c
Simple merge

diff --cc drivers/i2c/busses/i2c-s3c2410.c
Simple merge

diff --cc drivers/i2c/busses/i2c-simtec.c
Simple merge

diff --cc drivers/i2c/busses/i2c-sirf.c
Simple merge

diff --cc drivers/i2c/busses/i2c-stu300.c
Simple merge

diff --cc drivers/i2c/busses/i2c-tegra.c
Simple merge

diff --cc drivers/i2c/busses/i2c-wmt.c
Simple merge

diff --cc drivers/i2c/busses/scx200_acb.c
Simple merge