From patchwork Fri Mar 9 14:46:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 131135 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1082435lja; Fri, 9 Mar 2018 06:55:41 -0800 (PST) X-Google-Smtp-Source: AG47ELs6MXkvKE7At2Wyoyg/IL26AfC5ClZL2tdwg8pEbdmzN8MJiryHxbzfB/hRRMa1pLNYVtTw X-Received: by 10.99.141.200 with SMTP id z191mr2545538pgd.418.1520607341397; Fri, 09 Mar 2018 06:55:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520607341; cv=none; d=google.com; s=arc-20160816; b=KnUbe0V/xJIb0zXQTk50QaKr0o5sjwGVo1sCszwsCYBeAEbbFgzF8Tm87Z6MQ7oHTy W3UabNtrEp9Rofns1H5qf5jenMPEdJv1WxKarqzuv5rtzdR1UY2yoonPpB98NBQkY9IJ aO8tycUsveFyrbna7bhh06GQqjRuBNWLu4D7hFLoXa1C1IFwWuqoAgmXrUltjbnCvFkS 8+DyUWopUGD1L27r3tgAb/g31o1RPU2N2bptPZhm/KbFAXrSdNEm+J2fyoViF2eFjFOz 0gesckUval6ZeDhffiNHLkuoECbiv5lxM7/Y9i+aCAYE6wYvaDLVeUDi3/q9UUJ7zz/J PLyQ== 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=QB0wCS0zDECArGE81snX7r2xwwYd0ZHIjoAtnv+XtT4=; b=CFzk79a32rvfp6IeiLv7wiseMw65r3kSGXlXyhVzp6f/OCEZq3dSAV+ehF+7vPRTPV w53AQGhRLF07bmexzi5cOK1PjAAkaBPuDsoCF1hZ9RFi7+2I5AtNSMiTYXxHMDGg6N6z bAUxIRR6qh9lzKSlds9bjajhJpWVgXiBB+k0IZD0p5KabcXaAMOzKGInOuxrYRfcN0QY ZRyQFITTsjphQpHdY1cFOKgLYnhblZpzDqo03YiHego3/O1Kxxo/IbW7LQJT3o4CV/Bh 6345aHRjtnK3+jhCAPcK39AegUPttb0YMM0EIXJajWKUiM47nl60GsLpbapsunGMaP3/ Jz5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ML52Cz+d; 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 r16si968043pfl.163.2018.03.09.06.55.41; Fri, 09 Mar 2018 06:55:41 -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=ML52Cz+d; 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 S932446AbeCIOzg (ORCPT + 28 others); Fri, 9 Mar 2018 09:55:36 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:54555 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932238AbeCIOud (ORCPT ); Fri, 9 Mar 2018 09:50:33 -0500 Received: by mail-wm0-f65.google.com with SMTP id z81so4358542wmb.4 for ; Fri, 09 Mar 2018 06:50:32 -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=QB0wCS0zDECArGE81snX7r2xwwYd0ZHIjoAtnv+XtT4=; b=ML52Cz+dNQ6g4zZ5uY8eDcu+icDYi0vqglxmGN3s8IGH/QXZWCiXs8hMqpvPbeyiSM 9NCAspVCK3UkmYiJZsHOq5hKZ1hXo3SOss3EAQDUVAPYR/jURbFrMOaJO1gllBYxLPwT aJuYGxw4AfIyNPgcMTgXsy9SAxcPCovfuC4n0= 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=QB0wCS0zDECArGE81snX7r2xwwYd0ZHIjoAtnv+XtT4=; b=O0C7yhTKNt0JXVxb+t+zFjq5sAQRXVUo81GQIfGX4K3e9iHDSbgs465rq1F8a+hjS0 Rgenr+HoYx4ykVinl4WZQllxZ/Z+sTGnPvMqNktoVb7GSJL9mJLRAwpp0ZnIrZTVXry0 30CHXmqcwyqUTctfFx/18Y2bTDwERuUTZ7IJCsJGAkHrTKlLRamnzHXn7wneaPwdpr54 5v+UiGNN3SUUPiFaiZMtL2hTbqEajedMa/O6b4ydIwfhb3rBVCcS41gR7t32ZQoatitP BOiMsQvwTvJkqa4+Ba6R554/EhffJ7zRyZVRoWHsjMGsUOTqyP7rzP1lOv1ui/6cf5bg K6lw== X-Gm-Message-State: AElRT7GmaS/2BeqKAWlNDRrLq4Jy2veaEz/SnefZKXzemsJMKf2u3tc3 15IlEJQFVaCpQ4DGIDGbnIyV6Q== X-Received: by 10.28.216.70 with SMTP id p67mr2421302wmg.36.1520607031610; Fri, 09 Mar 2018 06:50:31 -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.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 06:50:31 -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 05/25] nvmem: imx-ocotp: Convert to use devm_nvmem_register() Date: Fri, 9 Mar 2018 14:46:59 +0000 Message-Id: <20180309144719.29904-6-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/imx-ocotp.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) -- 2.15.1 diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c index d7ba351a70c9..f1482c664b19 100644 --- a/drivers/nvmem/imx-ocotp.c +++ b/drivers/nvmem/imx-ocotp.c @@ -466,26 +466,14 @@ static int imx_ocotp_probe(struct platform_device *pdev) imx_ocotp_nvmem_config.dev = dev; imx_ocotp_nvmem_config.priv = priv; priv->config = &imx_ocotp_nvmem_config; - nvmem = nvmem_register(&imx_ocotp_nvmem_config); + nvmem = devm_nvmem_register(dev, &imx_ocotp_nvmem_config); - if (IS_ERR(nvmem)) - return PTR_ERR(nvmem); - platform_set_drvdata(pdev, nvmem); - - return 0; -} - -static int imx_ocotp_remove(struct platform_device *pdev) -{ - struct nvmem_device *nvmem = platform_get_drvdata(pdev); - - return nvmem_unregister(nvmem); + return PTR_ERR_OR_ZERO(nvmem); } static struct platform_driver imx_ocotp_driver = { .probe = imx_ocotp_probe, - .remove = imx_ocotp_remove, .driver = { .name = "imx_ocotp", .of_match_table = imx_ocotp_dt_ids,