summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2016-04-26 18:18:49 +0100
committerWim Van Sebroeck <wim@iguana.be>2016-05-14 16:24:43 +0200
commite26e74b15468b42c47cf9b045539720006abb1e4 (patch)
tree57ee265ac1167a3c056fb947aaaeeabb7c5c1a9b /drivers/watchdog
parentb97cb21a46341575c6cbe3d327a08b99030c3aee (diff)
downloadblackbird-op-linux-e26e74b15468b42c47cf9b045539720006abb1e4.tar.gz
blackbird-op-linux-e26e74b15468b42c47cf9b045539720006abb1e4.zip
watchdog: remove error message when unable to allocate watchdog device
The dev_err message is superfluous because the failure is already printed by dev_kzalloc, so remove it. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/jz4740_wdt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index 6a7d5c365438..c8d51ddb26d5 100644
--- a/drivers/watchdog/jz4740_wdt.c
+++ b/drivers/watchdog/jz4740_wdt.c
@@ -160,10 +160,8 @@ static int jz4740_wdt_probe(struct platform_device *pdev)
drvdata = devm_kzalloc(&pdev->dev, sizeof(struct jz4740_wdt_drvdata),
GFP_KERNEL);
- if (!drvdata) {
- dev_err(&pdev->dev, "Unable to alloacate watchdog device\n");
+ if (!drvdata)
return -ENOMEM;
- }
if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
heartbeat = DEFAULT_HEARTBEAT;
OpenPOWER on IntegriCloud