Skip to content

Commit

Permalink
i2c: remove unnecessary OOM messages
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jingoo Han authored and Wolfram Sang committed Jun 2, 2014
1 parent 157a801 commit 46797a2
Show file tree
Hide file tree
Showing 15 changed files with 14 additions and 44 deletions.
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-bcm2835.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion drivers/i2c/busses/i2c-diolan-u2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,6 @@ static int diolan_u2c_probe(struct usb_interface *interface,
/* allocate memory for our device state and initialize it */
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (dev == NULL) {
dev_err(&interface->dev, "no memory for device state\n");
ret = -ENOMEM;
goto error;
}
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-efm32.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,10 +320,8 @@ static int efm32_i2c_probe(struct platform_device *pdev)
return -EINVAL;

ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
if (!ddata) {
dev_dbg(&pdev->dev, "failed to allocate private data\n");
if (!ddata)
return -ENOMEM;
}
platform_set_drvdata(pdev, ddata);

init_completion(&ddata->done);
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-eg20t.c
Original file line number Diff line number Diff line change
Expand Up @@ -751,10 +751,8 @@ static int pch_i2c_probe(struct pci_dev *pdev,
pch_pci_dbg(pdev, "Entered.\n");

adap_info = kzalloc((sizeof(struct adapter_info)), GFP_KERNEL);
if (adap_info == NULL) {
pch_pci_err(pdev, "Memory allocation FAILED\n");
if (adap_info == NULL)
return -ENOMEM;
}

ret = pci_enable_device(pdev);
if (ret) {
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-exynos5.c
Original file line number Diff line number Diff line change
Expand Up @@ -662,10 +662,8 @@ static int exynos5_i2c_probe(struct platform_device *pdev)
int ret;

i2c = devm_kzalloc(&pdev->dev, sizeof(struct exynos5_i2c), GFP_KERNEL);
if (!i2c) {
dev_err(&pdev->dev, "no memory for state\n");
if (!i2c)
return -ENOMEM;
}

if (of_property_read_u32(np, "clock-frequency", &op_clock)) {
i2c->speed_mode = HSI2C_FAST_SPD;
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,10 +667,8 @@ static int i2c_imx_probe(struct platform_device *pdev)

i2c_imx = devm_kzalloc(&pdev->dev, sizeof(struct imx_i2c_struct),
GFP_KERNEL);
if (!i2c_imx) {
dev_err(&pdev->dev, "can't allocate interface\n");
if (!i2c_imx)
return -ENOMEM;
}

if (of_id)
i2c_imx->hwdata = of_id->data;
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1114,10 +1114,8 @@ omap_i2c_probe(struct platform_device *pdev)
}

dev = devm_kzalloc(&pdev->dev, sizeof(struct omap_i2c_dev), GFP_KERNEL);
if (!dev) {
dev_err(&pdev->dev, "Menory allocation failed\n");
if (!dev)
return -ENOMEM;
}

mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dev->base = devm_ioremap_resource(&pdev->dev, mem);
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-rcar.c
Original file line number Diff line number Diff line change
Expand Up @@ -509,10 +509,8 @@ static int rcar_i2c_probe(struct platform_device *pdev)
int irq, ret;

priv = devm_kzalloc(dev, sizeof(struct rcar_i2c_priv), GFP_KERNEL);
if (!priv) {
dev_err(dev, "no mem for private data\n");
if (!priv)
return -ENOMEM;
}

priv->clk = devm_clk_get(dev, NULL);
if (IS_ERR(priv->clk)) {
Expand Down
8 changes: 2 additions & 6 deletions drivers/i2c/busses/i2c-s3c2410.c
Original file line number Diff line number Diff line change
Expand Up @@ -1114,16 +1114,12 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
}

i2c = devm_kzalloc(&pdev->dev, sizeof(struct s3c24xx_i2c), GFP_KERNEL);
if (!i2c) {
dev_err(&pdev->dev, "no memory for state\n");
if (!i2c)
return -ENOMEM;
}

i2c->pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
if (!i2c->pdata) {
dev_err(&pdev->dev, "no memory for platform data\n");
if (!i2c->pdata)
return -ENOMEM;
}

i2c->quirks = s3c24xx_get_device_quirks(pdev);
if (pdata)
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-simtec.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,8 @@ static int simtec_i2c_probe(struct platform_device *dev)
int ret;

pd = kzalloc(sizeof(struct simtec_i2c_data), GFP_KERNEL);
if (pd == NULL) {
dev_err(&dev->dev, "cannot allocate private data\n");
if (pd == NULL)
return -ENOMEM;
}

platform_set_drvdata(dev, pd);

Expand Down
1 change: 0 additions & 1 deletion drivers/i2c/busses/i2c-sirf.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)

siic = devm_kzalloc(&pdev->dev, sizeof(*siic), GFP_KERNEL);
if (!siic) {
dev_err(&pdev->dev, "Can't allocate driver data\n");
err = -ENOMEM;
goto out;
}
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-stu300.c
Original file line number Diff line number Diff line change
Expand Up @@ -868,10 +868,8 @@ static int stu300_probe(struct platform_device *pdev)
int ret = 0;

dev = devm_kzalloc(&pdev->dev, sizeof(struct stu300_dev), GFP_KERNEL);
if (!dev) {
dev_err(&pdev->dev, "could not allocate device struct\n");
if (!dev)
return -ENOMEM;
}

bus_nr = pdev->id;
dev->clk = devm_clk_get(&pdev->dev, NULL);
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-tegra.c
Original file line number Diff line number Diff line change
Expand Up @@ -732,10 +732,8 @@ static int tegra_i2c_probe(struct platform_device *pdev)
}

i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
if (!i2c_dev) {
dev_err(&pdev->dev, "Could not allocate struct tegra_i2c_dev");
if (!i2c_dev)
return -ENOMEM;
}

i2c_dev->base = base;
i2c_dev->div_clk = div_clk;
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-wmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -379,10 +379,8 @@ static int wmt_i2c_probe(struct platform_device *pdev)
u32 clk_rate;

i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
if (!i2c_dev) {
dev_err(&pdev->dev, "device memory allocation failed\n");
if (!i2c_dev)
return -ENOMEM;
}

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
i2c_dev->base = devm_ioremap_resource(&pdev->dev, res);
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/scx200_acb.c
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,8 @@ static struct scx200_acb_iface *scx200_create_iface(const char *text,
struct i2c_adapter *adapter;

iface = kzalloc(sizeof(*iface), GFP_KERNEL);
if (!iface) {
pr_err("can't allocate memory\n");
if (!iface)
return NULL;
}

adapter = &iface->adapter;
i2c_set_adapdata(adapter, iface);
Expand Down

0 comments on commit 46797a2

Please sign in to comment.