Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8deea830 authored by Jingoo Han's avatar Jingoo Han Committed by Wim Van Sebroeck
Browse files

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: default avatarJingoo 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: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 8126334b

drivers/watchdog/at32ap700x_wdt.c

+1 −3
Original line number Diff line number Diff line
@@ -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) {

drivers/watchdog/bcm2835_wdt.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/watchdog/da9052_wdt.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/watchdog/da9055_wdt.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

drivers/watchdog/pcwd_usb.c

+1 −3
Original line number Diff line number Diff line
@@ -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;