From patchwork Fri Mar 9 14:47:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 131113 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1077495lja; Fri, 9 Mar 2018 06:50:42 -0800 (PST) X-Google-Smtp-Source: AG47ELsOsaof+LnVSMNnkd+O/JXkr2IduV3yH2RmdceUgwn9s0FcEvxyWfoG5oqYaI+8ppaYUa56 X-Received: by 10.99.119.72 with SMTP id s69mr24369521pgc.224.1520607042056; Fri, 09 Mar 2018 06:50:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520607042; cv=none; d=google.com; s=arc-20160816; b=ztTnUr9S0tptipIwr+Jzbx4fB0vEXzxErPt0HH1BCUIyosnms8d119UqXFoLpa0leA q10J82sfeNV1vXW1Wz7kIYUqZBNXnxzAHvTWpfEtPqs4rQadTzxrSoMHtuCjuuXn7Csu Onwj9FrbC8MfbYnF5lWvqONSgd+XhKj5CQQXv2e5Ur3zxxuvqkcTlcBVGHo6FWNMsxsb 4/QObOHWYTGJCUtVw2O9v/IXBfBoPa1+FD8opWhaRve4DSnlb+J1lnQ5xq+yrQ/PGnWs sd1wcMUTbEt3fyg3sEE/OvcLQFr0fYMS/jDqpCm/hsOe/1EZ2ZPyZ3vfg1R80SoHvFf3 Qewg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=iUanzWQSXWeBvkXCvc41usxvXwyGqv6365hkQYXbiXU=; b=MXAPCtN0KQxWXV7hGMcrLSOx24ecJWZH34vzOoejWTwAGctv8iPQ43nUOZNWe5cq8J kmCtNiVMAb1sU/0sVOq5rUakJXJ+bV9zOctzswai3dgr9emmQO0coVGiyKQ6IXLSaO6L nY8ybvEMRrFnSBzqwpC2hW/agXhGORgoaPXMpDHule0s9twsXgbC5jiQ24HKLSYfAf1/ l4YdJYHFw28WY/kBp/jtmfD7Zs1aUHR/n7ock6jZg3A+/w39OFsJkRT/T5PLRg5bm32U VneXLx1HE5Eh+bW3FLZbt4q3Ktky13Nk+sGS4eoLHoI4AJ56ar5EmWnKQDa9rVm69YnX p++A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q+XtcRfo; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c14si821127pgu.341.2018.03.09.06.50.41; Fri, 09 Mar 2018 06:50:42 -0800 (PST) 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=@linaro.org header.s=google header.b=Q+XtcRfo; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932313AbeCIOui (ORCPT + 28 others); Fri, 9 Mar 2018 09:50:38 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36717 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932251AbeCIOud (ORCPT ); Fri, 9 Mar 2018 09:50:33 -0500 Received: by mail-wr0-f194.google.com with SMTP id v111so9284553wrb.3 for ; Fri, 09 Mar 2018 06:50:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iUanzWQSXWeBvkXCvc41usxvXwyGqv6365hkQYXbiXU=; b=Q+XtcRfoMzwbeBH7rs3ZzfgZuEdme83w+iTpMLXwN7IB3/U6Rdi4Cva45cbFUUzhV5 y9yKSl0zyeHhRYw+hvlZ9kNVeQBYgRJc6XWYc7/LlpXxU575xdFd+f3QNQoxRPXCmRNB J7b+MjNU/3mWFN3JzDm5yWl0e6VR+WDMeNjKY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iUanzWQSXWeBvkXCvc41usxvXwyGqv6365hkQYXbiXU=; b=JzZ1gsVRS9hp4uSl6Tpg9CpBWoYUxTH0jPtulhZPEtpsTqtgTFkvUUCk9MQgqlDyi9 1clth03tc6kC86x3sOaie5xNvq0nsOVJgyCy8BVjywpvTlv2E71/mNCbDvjjxaAzfLRd hYQC22uefZbdIcw7X5DhZ6cLMqzkKIIFOcsl5E8hR24puQd8HSe3V3aX4nhPZxIlpY7y pW/SWizH4jzIPT00DLDfzWrPKeUDIChSl3Hpoj0DzgSx8G9YbXEr8Gi5BiE9uHyOlD32 idM547BxIy85TwDROd8CPqVFQtILMt6zo31XsLGXJt/xCQMSVKp8ifqg7IhhmoRF+EtW kogw== X-Gm-Message-State: APf1xPABobAFP6dSGUhqqH74wOzPYZi5TTqvWSKVhZVAhhqbuAFJnLS8 y14U6ckSjwSGVcuw29k8KlKDKQ== X-Received: by 10.223.187.68 with SMTP id x4mr24580707wrg.80.1520607032756; Fri, 09 Mar 2018 06:50:32 -0800 (PST) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id u48sm1191901wrb.85.2018.03.09.06.50.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 06:50:32 -0800 (PST) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, srinivas.kandagatla@linaro.org, Andrey Smirnov , Heiko Stuebner , Masahiro Yamada , Carlo Caione , Kevin Hilman , Matthias Brugger , cphealy@gmail.com, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/25] nvmem: uniphier-efuse: Convert to use devm_nvmem_register() Date: Fri, 9 Mar 2018 14:47:00 +0000 Message-Id: <20180309144719.29904-7-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180309144719.29904-1-srinivas.kandagatla@linaro.org> References: <20180309144719.29904-1-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrey Smirnov Drop all of the code related to .remove hook and make use of devm_nvmem_register() instead. Cc: Srinivas Kandagatla Cc: Heiko Stuebner Cc: Masahiro Yamada Cc: Carlo Caione Cc: Kevin Hilman Cc: Matthias Brugger Cc: cphealy@gmail.com Cc: linux-kernel@vger.kernel.org Cc: linux-mediatek@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Andrey Smirnov Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/uniphier-efuse.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) -- 2.15.1 diff --git a/drivers/nvmem/uniphier-efuse.c b/drivers/nvmem/uniphier-efuse.c index be11880a1358..271f0b2ff86a 100644 --- a/drivers/nvmem/uniphier-efuse.c +++ b/drivers/nvmem/uniphier-efuse.c @@ -60,20 +60,9 @@ static int uniphier_efuse_probe(struct platform_device *pdev) econfig.size = resource_size(res); econfig.priv = priv; econfig.dev = dev; - nvmem = nvmem_register(&econfig); - if (IS_ERR(nvmem)) - return PTR_ERR(nvmem); + nvmem = devm_nvmem_register(dev, &econfig); - platform_set_drvdata(pdev, nvmem); - - return 0; -} - -static int uniphier_efuse_remove(struct platform_device *pdev) -{ - struct nvmem_device *nvmem = platform_get_drvdata(pdev); - - return nvmem_unregister(nvmem); + return PTR_ERR_OR_ZERO(nvmem); } static const struct of_device_id uniphier_efuse_of_match[] = { @@ -84,7 +73,6 @@ MODULE_DEVICE_TABLE(of, uniphier_efuse_of_match); static struct platform_driver uniphier_efuse_driver = { .probe = uniphier_efuse_probe, - .remove = uniphier_efuse_remove, .driver = { .name = "uniphier-efuse", .of_match_table = uniphier_efuse_of_match,