From patchwork Fri Mar 9 14:46:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 131136 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1083182lja; Fri, 9 Mar 2018 06:56:28 -0800 (PST) X-Google-Smtp-Source: AG47ELtLKK9z6OgrS9kK5iGsmU5gm4vQh1ZauObpk0gfgTagSG5nvZ5KznQuxI5bw1niyrOlN18c X-Received: by 10.101.100.208 with SMTP id t16mr23652337pgv.398.1520607388786; Fri, 09 Mar 2018 06:56:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520607388; cv=none; d=google.com; s=arc-20160816; b=rqGMXkhWrpt4sqWBGv4tiJXhez59h5dqoLvtmfDj+Qoad0/AfG7m50+sIUlLwf6p6T 60VMic/+/Q3UCtKgsLY2KeFIeR65zLu6JfOGHqoN/xjM3c6IsuQrztbi9922DX2+f80u gjGC6Mv9OBgIoEMlPVFMAklN8UYKBOnCaWnqRSNlMwTTmwX5pk6YlXO/t6jnM1AqWnk9 a3P4ojdc9lTP7C58M/PYpEJbLANTt5zc6G2Je7sgbos4uW3d13s51rMlTjue0ULzqwce L8ygF19aOlehig1HrzL31lIHJOi7iOAoaZk2rPirrGOd+TjkITwBhXj7bt41RKl8UF5e 7Axg== 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=BRXbg/NYMkWx49UVLwrgUxtCLt0980URCxFsjoA8MUw=; b=v2wbqNWOOaoqJvciuluaTR0Ce6yXoVX7vQaj/zyGk2o05bBHLr0Mff2ge22aa307X4 hy+1faJbr3McHZyqZE4srBTqZbTH6iQUiyZAFLnwsrU6pzXa6UIUe97j83CLAo81BdgN +AV/r7xkBUapVJWEepKOF7G0k0B3zbzNxjg/cpebkWeSPYPLSbkKGrbBWJ+IbzErL1D+ m4QeJ1pBeYaL/hcrcpWI3lLulPzxUgECCLGSv5t6UExx1Rxp/Q4av9TP7V0a5OcNufqm JL5ZlA/ZxvMyI9vANsfH8FnWlZEnglRZ/Cs/d42EUpr2y5xZ/V5dU1qP8ioaHBckqedJ dbHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iL4ZQnm/; 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 a9-v6si1027983plt.242.2018.03.09.06.56.28; Fri, 09 Mar 2018 06:56:28 -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=iL4ZQnm/; 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 S932352AbeCIO4Y (ORCPT + 28 others); Fri, 9 Mar 2018 09:56:24 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:40606 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751239AbeCIOub (ORCPT ); Fri, 9 Mar 2018 09:50:31 -0500 Received: by mail-wr0-f196.google.com with SMTP id o76so9266205wrb.7 for ; Fri, 09 Mar 2018 06:50:31 -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=BRXbg/NYMkWx49UVLwrgUxtCLt0980URCxFsjoA8MUw=; b=iL4ZQnm/nJW8P1Rpp02O9OiTfE+tGn79Vz15rLdiT+tbmiwzxNjhyGWsLN+UMVXY9u ClEvOjx98q0WUBkYAshEZC287N8+WeEZ5yODbdWlb7mSi9llBWICx6+CjTsNDypJBYf8 H8X7wQEBkq94dvbEXTm78Kw4bkqp19/dSYFOE= 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=BRXbg/NYMkWx49UVLwrgUxtCLt0980URCxFsjoA8MUw=; b=ADfsO5i1FGPByGn1vMYMR8u9I7NsXn88DXcxSpS7pc6pMDj41VPEz6zE/hgYGqRbVw H/GvOyTDH7n4Py6AYQUf439o4OmZZOgX99y+u5UasS93qSnFwqB6vxUSIt7Th9Scb765 rbBJeofqqVfTXE+EM+cXBTlEg/kmnMPgM62goA+++K+Gd4c8G1kxhnml2kk8KSnU+bDY ejw2Qu+3WKE7CgxzXDdzsrN34Ls4IqNJtlp01JRtbC64YtOYp25hitD++1QuiirLndfP dVxa/h2VEDaHmxbekyIg1rtoiRGUxYotovsBCiELvbLcP3kueMDvpPVFRKRz/625v9QE tIYw== X-Gm-Message-State: APf1xPApMvTNC12M2SdCvLP2PfL22rAsW4tZ5tmm+5PpmbBKktDgKL6J xzjEBlOGkRV40B8pPWur9E2Uxg== X-Received: by 10.223.182.2 with SMTP id f2mr24195018wre.117.1520607030461; Fri, 09 Mar 2018 06:50:30 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 06:50:29 -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 04/25] nvmem: vf610-ocotp: Convert to use devm_nvmem_register() Date: Fri, 9 Mar 2018 14:46:58 +0000 Message-Id: <20180309144719.29904-5-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/vf610-ocotp.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) -- 2.15.1 diff --git a/drivers/nvmem/vf610-ocotp.c b/drivers/nvmem/vf610-ocotp.c index 5ae9e002f195..5a395ffb2ca8 100644 --- a/drivers/nvmem/vf610-ocotp.c +++ b/drivers/nvmem/vf610-ocotp.c @@ -217,13 +217,6 @@ static const struct of_device_id ocotp_of_match[] = { }; MODULE_DEVICE_TABLE(of, ocotp_of_match); -static int vf610_ocotp_remove(struct platform_device *pdev) -{ - struct vf610_ocotp *ocotp_dev = platform_get_drvdata(pdev); - - return nvmem_unregister(ocotp_dev->nvmem); -} - static int vf610_ocotp_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -246,26 +239,20 @@ static int vf610_ocotp_probe(struct platform_device *pdev) PTR_ERR(ocotp_dev->clk)); return PTR_ERR(ocotp_dev->clk); } + ocotp_dev->dev = dev; + ocotp_dev->timing = vf610_ocotp_calculate_timing(ocotp_dev); ocotp_config.size = resource_size(res); ocotp_config.priv = ocotp_dev; ocotp_config.dev = dev; - ocotp_dev->nvmem = nvmem_register(&ocotp_config); - if (IS_ERR(ocotp_dev->nvmem)) - return PTR_ERR(ocotp_dev->nvmem); + ocotp_dev->nvmem = devm_nvmem_register(dev, &ocotp_config); - ocotp_dev->dev = dev; - platform_set_drvdata(pdev, ocotp_dev); - - ocotp_dev->timing = vf610_ocotp_calculate_timing(ocotp_dev); - - return 0; + return PTR_ERR_OR_ZERO(ocotp_dev->nvmem); } static struct platform_driver vf610_ocotp_driver = { .probe = vf610_ocotp_probe, - .remove = vf610_ocotp_remove, .driver = { .name = "vf610-ocotp", .of_match_table = ocotp_of_match,