aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/watchdog/at32ap700x_wdt.c4
-rw-r--r--drivers/watchdog/bcm2835_wdt.c4
-rw-r--r--drivers/watchdog/da9052_wdt.c1
-rw-r--r--drivers/watchdog/da9055_wdt.c4
-rw-r--r--drivers/watchdog/pcwd_usb.c4
-rw-r--r--drivers/watchdog/sp805_wdt.c1
-rw-r--r--drivers/watchdog/ts72xx_wdt.c4
-rw-r--r--drivers/watchdog/wm831x_wdt.c1
8 files changed, 5 insertions, 18 deletions
diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c
index afe7d17e6776..25b5c67d3af9 100644
--- 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)
323 323
324 wdt = devm_kzalloc(&pdev->dev, sizeof(struct wdt_at32ap700x), 324 wdt = devm_kzalloc(&pdev->dev, sizeof(struct wdt_at32ap700x),
325 GFP_KERNEL); 325 GFP_KERNEL);
326 if (!wdt) { 326 if (!wdt)
327 dev_dbg(&pdev->dev, "no memory for wdt structure\n");
328 return -ENOMEM; 327 return -ENOMEM;
329 }
330 328
331 wdt->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs)); 329 wdt->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs));
332 if (!wdt->regs) { 330 if (!wdt->regs) {
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index cafa973c43be..8df450c090a9 100644
--- 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)
114 int err; 114 int err;
115 115
116 wdt = devm_kzalloc(dev, sizeof(struct bcm2835_wdt), GFP_KERNEL); 116 wdt = devm_kzalloc(dev, sizeof(struct bcm2835_wdt), GFP_KERNEL);
117 if (!wdt) { 117 if (!wdt)
118 dev_err(dev, "Failed to allocate memory for watchdog device");
119 return -ENOMEM; 118 return -ENOMEM;
120 }
121 platform_set_drvdata(pdev, wdt); 119 platform_set_drvdata(pdev, wdt);
122 120
123 spin_lock_init(&wdt->lock); 121 spin_lock_init(&wdt->lock);
diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index f09c54e9686f..2e9589652e1e 100644
--- 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)
185 driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data), 185 driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data),
186 GFP_KERNEL); 186 GFP_KERNEL);
187 if (!driver_data) { 187 if (!driver_data) {
188 dev_err(da9052->dev, "Unable to alloacate watchdog device\n");
189 ret = -ENOMEM; 188 ret = -ENOMEM;
190 goto err; 189 goto err;
191 } 190 }
diff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c
index 575f37a965a4..495089d8dbfe 100644
--- 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)
151 151
152 driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data), 152 driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data),
153 GFP_KERNEL); 153 GFP_KERNEL);
154 if (!driver_data) { 154 if (!driver_data)
155 dev_err(da9055->dev, "Failed to allocate watchdog device\n");
156 return -ENOMEM; 155 return -ENOMEM;
157 }
158 156
159 driver_data->da9055 = da9055; 157 driver_data->da9055 = da9055;
160 158
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index e562e0476016..1a11aedc4fe8 100644
--- 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,
645 645
646 /* allocate memory for our device and initialize it */ 646 /* allocate memory for our device and initialize it */
647 usb_pcwd = kzalloc(sizeof(struct usb_pcwd_private), GFP_KERNEL); 647 usb_pcwd = kzalloc(sizeof(struct usb_pcwd_private), GFP_KERNEL);
648 if (usb_pcwd == NULL) { 648 if (usb_pcwd == NULL)
649 pr_err("Out of memory\n");
650 goto error; 649 goto error;
651 }
652 650
653 usb_pcwd_device = usb_pcwd; 651 usb_pcwd_device = usb_pcwd;
654 652
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 6ee6db11ad94..9a645d6c9d96 100644
--- 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)
217 217
218 wdt = devm_kzalloc(&adev->dev, sizeof(*wdt), GFP_KERNEL); 218 wdt = devm_kzalloc(&adev->dev, sizeof(*wdt), GFP_KERNEL);
219 if (!wdt) { 219 if (!wdt) {
220 dev_warn(&adev->dev, "Kzalloc failed\n");
221 ret = -ENOMEM; 220 ret = -ENOMEM;
222 goto err; 221 goto err;
223 } 222 }
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index 09d4831aa61f..6959fa0f64b6 100644
--- 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)
394 int error = 0; 394 int error = 0;
395 395
396 wdt = devm_kzalloc(&pdev->dev, sizeof(struct ts72xx_wdt), GFP_KERNEL); 396 wdt = devm_kzalloc(&pdev->dev, sizeof(struct ts72xx_wdt), GFP_KERNEL);
397 if (!wdt) { 397 if (!wdt)
398 dev_err(&pdev->dev, "failed to allocate memory\n");
399 return -ENOMEM; 398 return -ENOMEM;
400 }
401 399
402 r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0); 400 r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
403 wdt->control_reg = devm_ioremap_resource(&pdev->dev, r1); 401 wdt->control_reg = devm_ioremap_resource(&pdev->dev, r1);
diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index e243bd01c774..2fa17e746ff6 100644
--- 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)
204 driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data), 204 driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data),
205 GFP_KERNEL); 205 GFP_KERNEL);
206 if (!driver_data) { 206 if (!driver_data) {
207 dev_err(wm831x->dev, "Unable to alloacate watchdog device\n");
208 ret = -ENOMEM; 207 ret = -ENOMEM;
209 goto err; 208 goto err;
210 } 209 }