watchdog: 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>
Reviewed-by: Jean Delvare <jdelvare@suse.de> [for at32ap700x]
Acked-by: Lubomir Rintel <lkundrak@v3.sk> [for bcm2835]
Acked-by: Viresh Kumar <viresh.kumar@linaro.org> [for sp805_wdt]
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> [for ts72xx_wdt]
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c
index afe7d17e677634f1fd447a147deeb133ac366f36..25b5c67d3af99cfb6608a5dd1a8c556e73ca7e31 100644 (file)
--- a/drivers/watchdog/at32ap700x_wdt.c
+++ b/drivers/watchdog/at32ap700x_wdt.c
@@ -323,10 +323,8 @@ static int __init at32_wdt_probe(struct platform_device *pdev)
 
        wdt = devm_kzalloc(&pdev->dev, sizeof(struct wdt_at32ap700x),
                        GFP_KERNEL);
-       if (!wdt) {
-               dev_dbg(&pdev->dev, "no memory for wdt structure\n");
+       if (!wdt)
                return -ENOMEM;
-       }
 
        wdt->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs));
        if (!wdt->regs) {

diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index cafa973c43be7af984fb9d39456b1d36b8913ea8..8df450c090a913d0394ca16c5ae241fd7d233db6 100644 (file)
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -114,10 +114,8 @@ static int bcm2835_wdt_probe(struct platform_device *pdev)
        int err;
 
        wdt = devm_kzalloc(dev, sizeof(struct bcm2835_wdt), GFP_KERNEL);
-       if (!wdt) {
-               dev_err(dev, "Failed to allocate memory for watchdog device");
+       if (!wdt)
                return -ENOMEM;
-       }
        platform_set_drvdata(pdev, wdt);
 
        spin_lock_init(&wdt->lock);

diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index f09c54e9686fad94104a7679aa7a7675d32d3ebd..2e9589652e1eee2a88f6fd137bde5366b6af77c3 100644 (file)
--- a/drivers/watchdog/da9052_wdt.c
+++ b/drivers/watchdog/da9052_wdt.c
@@ -185,7 +185,6 @@ static int da9052_wdt_probe(struct platform_device *pdev)
        driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data),
                                   GFP_KERNEL);
        if (!driver_data) {
-               dev_err(da9052->dev, "Unable to alloacate watchdog device\n");
                ret = -ENOMEM;
                goto err;
        }

diff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c
index 575f37a965a471ba93a77a4bdda5840f0dc7b8e0..495089d8dbfeb7965142c48f2579672ed8882d6c 100644 (file)
--- a/drivers/watchdog/da9055_wdt.c
+++ b/drivers/watchdog/da9055_wdt.c
@@ -151,10 +151,8 @@ static int da9055_wdt_probe(struct platform_device *pdev)
 
        driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data),
                                   GFP_KERNEL);
-       if (!driver_data) {
-               dev_err(da9055->dev, "Failed to allocate watchdog device\n");
+       if (!driver_data)
                return -ENOMEM;
-       }
 
        driver_data->da9055 = da9055;
 

diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index e562e04760161003f75e2cbd19a443d9dbd251f5..1a11aedc4fe850738bfe17d469232da64959b84d 100644 (file)
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -645,10 +645,8 @@ static int usb_pcwd_probe(struct usb_interface *interface,
 
        /* allocate memory for our device and initialize it */
        usb_pcwd = kzalloc(sizeof(struct usb_pcwd_private), GFP_KERNEL);
-       if (usb_pcwd == NULL) {
-               pr_err("Out of memory\n");
+       if (usb_pcwd == NULL)
                goto error;
-       }
 
        usb_pcwd_device = usb_pcwd;
 

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 6ee6db11ad946bee8bc244338cdb50c0548f85d5..9a645d6c9d96af385e727080fd532923ec318343 100644 (file)
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -217,7 +217,6 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
 
        wdt = devm_kzalloc(&adev->dev, sizeof(*wdt), GFP_KERNEL);
        if (!wdt) {
-               dev_warn(&adev->dev, "Kzalloc failed\n");
                ret = -ENOMEM;
                goto err;
        }

diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index 09d4831aa61f8328b6291f97849c9adf06b62b0a..6959fa0f64b67997f7a07f2b886fbf4cfc8f5c25 100644 (file)
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -394,10 +394,8 @@ static int ts72xx_wdt_probe(struct platform_device *pdev)
        int error = 0;
 
        wdt = devm_kzalloc(&pdev->dev, sizeof(struct ts72xx_wdt), GFP_KERNEL);
-       if (!wdt) {
-               dev_err(&pdev->dev, "failed to allocate memory\n");
+       if (!wdt)
                return -ENOMEM;
-       }
 
        r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        wdt->control_reg = devm_ioremap_resource(&pdev->dev, r1);

diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index e243bd01c774274813e48c7dbfdcb56e53af3197..2fa17e746ff6f43dfff2042d5306934c4eab4cf8 100644 (file)
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -204,7 +204,6 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
        driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data),
                                   GFP_KERNEL);
        if (!driver_data) {
-               dev_err(wm831x->dev, "Unable to alloacate watchdog device\n");
                ret = -ENOMEM;
                goto err;
        }