From patchwork Sun May 1 10:36:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 66983 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp568781qge; Sun, 1 May 2016 03:39:20 -0700 (PDT) X-Received: by 10.98.66.145 with SMTP id h17mr24703895pfd.100.1462099160147; Sun, 01 May 2016 03:39:20 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 201si13777163pfu.156.2016.05.01.03.39.19; Sun, 01 May 2016 03:39:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752423AbcEAKjS (ORCPT + 29 others); Sun, 1 May 2016 06:39:18 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:21997 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752151AbcEAKjP (ORCPT ); Sun, 1 May 2016 06:39:15 -0400 Received: from grover.sesame (FL1-119-242-215-193.osk.mesh.ad.jp [119.242.215.193]) (authenticated) by conuserg-07.nifty.com with ESMTP id u41AbfDn016707; Sun, 1 May 2016 19:38:02 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com u41AbfDn016707 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1462099083; bh=wL4CcTpBMz1gP7mqaqGwUGYXny1rmsDUZPJTUXBzJVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hhkNz2dd2slAF2pO5uhOVDcYziwVZXM3EMhf6Pdc/PA56Cl/9UO5jZNiDrH0bIypx KkvqT8M1OAFUcxXvMQokFJXH1p7ZyhmpR/26lvUGoS6QVYrDB2mzqC8+Us+cVOa4VX X12n2Q0Yy/BlcAwzy/JNbMesNJmp47ocdRVHqGGuEUqcKMRkJxAJGeNSqfxOeaP+sf cqlEXmw373SzNctkid3rnRSnhRlXDkgi7BzxB/yQFzkOKcKNStBPfcmHZmZdzX0k9r yQ5AXJMAV0Or6lIueLdDHP5SCm93rzPttz+aVwrx0G/nAdOtMY3ZaMuNnFRwzJLYn+ oEr9XG8QvslvQ== X-Nifty-SrcIP: [119.242.215.193] From: Masahiro Yamada To: Philipp Zabel Cc: linux-arm-kernel@lists.infradead.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/7] reset: ath79: use devm_reset_controller_register() Date: Sun, 1 May 2016 19:36:58 +0900 Message-Id: <1462099023-11819-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462099023-11819-1-git-send-email-yamada.masahiro@socionext.com> References: <1462099023-11819-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use devm_reset_controller_register() for the reset controller registration and remove the unregister call from the .remove callback. Signed-off-by: Masahiro Yamada --- drivers/reset/reset-ath79.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 1.9.1 diff --git a/drivers/reset/reset-ath79.c b/drivers/reset/reset-ath79.c index ccb940a..16d410c 100644 --- a/drivers/reset/reset-ath79.c +++ b/drivers/reset/reset-ath79.c @@ -112,7 +112,7 @@ static int ath79_reset_probe(struct platform_device *pdev) ath79_reset->rcdev.of_reset_n_cells = 1; ath79_reset->rcdev.nr_resets = 32; - err = reset_controller_register(&ath79_reset->rcdev); + err = devm_reset_controller_register(&pdev->dev, &ath79_reset->rcdev); if (err) return err; @@ -131,7 +131,6 @@ static int ath79_reset_remove(struct platform_device *pdev) struct ath79_reset *ath79_reset = platform_get_drvdata(pdev); unregister_restart_handler(&ath79_reset->restart_nb); - reset_controller_unregister(&ath79_reset->rcdev); return 0; }