Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751477AbeACUB2 (ORCPT + 1 other); Wed, 3 Jan 2018 15:01:28 -0500 Received: from mail-pl0-f67.google.com ([209.85.160.67]:44132 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751351AbeACUBY (ORCPT ); Wed, 3 Jan 2018 15:01:24 -0500 X-Google-Smtp-Source: ACJfBosatUv6zU594/HC94cIaLnQqUVwnsJ3JrD25Fhp2aUheltMQWdIO/0lBnEZDkcOptmGIPLTrQ== From: Andrey Smirnov To: Srinivas Kandagatla Cc: Andrey Smirnov , Heiko Stuebner , Masahiro Yamada , Carlo Caione , Kevin Hilman , Matthias Brugger , cphealy@gmail.com, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 04/22] nvmem: vf610-ocotp: Convert to use devm_nvmem_register() Date: Wed, 3 Jan 2018 12:00:56 -0800 Message-Id: <20180103200114.23922-5-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180103200114.23922-1-andrew.smirnov@gmail.com> References: <20180103200114.23922-1-andrew.smirnov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: 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 --- drivers/nvmem/vf610-ocotp.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/nvmem/vf610-ocotp.c b/drivers/nvmem/vf610-ocotp.c index 5ae9e002f195..752a0983e7fb 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; @@ -251,13 +244,11 @@ static int vf610_ocotp_probe(struct platform_device *pdev) ocotp_config.priv = ocotp_dev; ocotp_config.dev = dev; - ocotp_dev->nvmem = nvmem_register(&ocotp_config); + ocotp_dev->nvmem = devm_nvmem_register(dev, &ocotp_config); if (IS_ERR(ocotp_dev->nvmem)) return PTR_ERR(ocotp_dev->nvmem); ocotp_dev->dev = dev; - platform_set_drvdata(pdev, ocotp_dev); - ocotp_dev->timing = vf610_ocotp_calculate_timing(ocotp_dev); return 0; @@ -265,7 +256,6 @@ static int vf610_ocotp_probe(struct platform_device *pdev) 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, -- 2.14.3