Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jingoo Han and committed by
Wim Van Sebroeck
8deea830 8126334b

+5 -18
+1 -3
drivers/watchdog/at32ap700x_wdt.c
··· 323 323 324 324 wdt = devm_kzalloc(&pdev->dev, sizeof(struct wdt_at32ap700x), 325 325 GFP_KERNEL); 326 - if (!wdt) { 327 - dev_dbg(&pdev->dev, "no memory for wdt structure\n"); 326 + if (!wdt) 328 327 return -ENOMEM; 329 - } 330 328 331 329 wdt->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs)); 332 330 if (!wdt->regs) {
+1 -3
drivers/watchdog/bcm2835_wdt.c
··· 114 114 int err; 115 115 116 116 wdt = devm_kzalloc(dev, sizeof(struct bcm2835_wdt), GFP_KERNEL); 117 - if (!wdt) { 118 - dev_err(dev, "Failed to allocate memory for watchdog device"); 117 + if (!wdt) 119 118 return -ENOMEM; 120 - } 121 119 platform_set_drvdata(pdev, wdt); 122 120 123 121 spin_lock_init(&wdt->lock);
-1
drivers/watchdog/da9052_wdt.c
··· 185 185 driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data), 186 186 GFP_KERNEL); 187 187 if (!driver_data) { 188 - dev_err(da9052->dev, "Unable to alloacate watchdog device\n"); 189 188 ret = -ENOMEM; 190 189 goto err; 191 190 }
+1 -3
drivers/watchdog/da9055_wdt.c
··· 151 151 152 152 driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data), 153 153 GFP_KERNEL); 154 - if (!driver_data) { 155 - dev_err(da9055->dev, "Failed to allocate watchdog device\n"); 154 + if (!driver_data) 156 155 return -ENOMEM; 157 - } 158 156 159 157 driver_data->da9055 = da9055; 160 158
+1 -3
drivers/watchdog/pcwd_usb.c
··· 645 645 646 646 /* allocate memory for our device and initialize it */ 647 647 usb_pcwd = kzalloc(sizeof(struct usb_pcwd_private), GFP_KERNEL); 648 - if (usb_pcwd == NULL) { 649 - pr_err("Out of memory\n"); 648 + if (usb_pcwd == NULL) 650 649 goto error; 651 - } 652 650 653 651 usb_pcwd_device = usb_pcwd; 654 652
-1
drivers/watchdog/sp805_wdt.c
··· 217 217 218 218 wdt = devm_kzalloc(&adev->dev, sizeof(*wdt), GFP_KERNEL); 219 219 if (!wdt) { 220 - dev_warn(&adev->dev, "Kzalloc failed\n"); 221 220 ret = -ENOMEM; 222 221 goto err; 223 222 }
+1 -3
drivers/watchdog/ts72xx_wdt.c
··· 394 394 int error = 0; 395 395 396 396 wdt = devm_kzalloc(&pdev->dev, sizeof(struct ts72xx_wdt), GFP_KERNEL); 397 - if (!wdt) { 398 - dev_err(&pdev->dev, "failed to allocate memory\n"); 397 + if (!wdt) 399 398 return -ENOMEM; 400 - } 401 399 402 400 r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0); 403 401 wdt->control_reg = devm_ioremap_resource(&pdev->dev, r1);
-1
drivers/watchdog/wm831x_wdt.c
··· 204 204 driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data), 205 205 GFP_KERNEL); 206 206 if (!driver_data) { 207 - dev_err(wm831x->dev, "Unable to alloacate watchdog device\n"); 208 207 ret = -ENOMEM; 209 208 goto err; 210 209 }