From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965396AbeAJMOR (ORCPT + 1 other); Wed, 10 Jan 2018 07:14:17 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:47094 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753348AbeAJMN1 (ORCPT ); Wed, 10 Jan 2018 07:13:27 -0500 X-Google-Smtp-Source: ACJfBos22gm6OS4WsAt4PUZcSJHoB8tGYcczhExG0hOsabPS+B4GxpjQ40B/lqV7vvnGh9+3VUHK4w== From: =?UTF-8?q?Andr=C3=A9=20Draszik?= To: linux-kernel@vger.kernel.org Cc: Wim Van Sebroeck , Guenter Roeck , linux-watchdog@vger.kernel.org, John Crispin Subject: [PATCH 2/2] watchdog: mt7621: switch to using managed devm_watchdog_register_device() Date: Wed, 10 Jan 2018 12:13:23 +0000 Message-Id: <20180110121323.17657-2-git@andred.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180110121323.17657-1-git@andred.net> References: <20180110121323.17657-1-git@andred.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: This does the necessary cleanup on driver unload automatically. Signed-off-by: André Draszik Cc: Wim Van Sebroeck Cc: Guenter Roeck Cc: linux-watchdog@vger.kernel.org Cc: John Crispin --- drivers/watchdog/mt7621_wdt.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c index 0eabea2d88a2..a04f49309188 100644 --- a/drivers/watchdog/mt7621_wdt.c +++ b/drivers/watchdog/mt7621_wdt.c @@ -133,7 +133,6 @@ static struct watchdog_device mt7621_wdt_dev = { static int mt7621_wdt_probe(struct platform_device *pdev) { struct resource *res; - int ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); mt7621_wdt_base = devm_ioremap_resource(&pdev->dev, res); @@ -161,16 +160,7 @@ static int mt7621_wdt_probe(struct platform_device *pdev) set_bit(WDOG_HW_RUNNING, &mt7621_wdt_dev.status); } - ret = watchdog_register_device(&mt7621_wdt_dev); - - return 0; -} - -static int mt7621_wdt_remove(struct platform_device *pdev) -{ - watchdog_unregister_device(&mt7621_wdt_dev); - - return 0; + return devm_watchdog_register_device(&pdev->dev, &mt7621_wdt_dev); } static void mt7621_wdt_shutdown(struct platform_device *pdev) @@ -186,7 +176,6 @@ MODULE_DEVICE_TABLE(of, mt7621_wdt_match); static struct platform_driver mt7621_wdt_driver = { .probe = mt7621_wdt_probe, - .remove = mt7621_wdt_remove, .shutdown = mt7621_wdt_shutdown, .driver = { .name = KBUILD_MODNAME, -- 2.15.1