From patchwork Sun Aug 11 05:45:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 11088727 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 753BA13AC for ; Sun, 11 Aug 2019 05:46:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60ADC201F3 for ; Sun, 11 Aug 2019 05:46:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50FEA228C9; Sun, 11 Aug 2019 05:46:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6D3D201F3 for ; Sun, 11 Aug 2019 05:46:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726164AbfHKFp4 (ORCPT ); Sun, 11 Aug 2019 01:45:56 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:41163 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725829AbfHKFp4 (ORCPT ); Sun, 11 Aug 2019 01:45:56 -0400 Received: by mail-pl1-f193.google.com with SMTP id m9so46469966pls.8; Sat, 10 Aug 2019 22:45:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tWYbNtmjE1k1tu/MG+O0SFJsDideswIxOdaCbUQYasE=; b=gAitQKL09xt88JIc9HbcMcn5r6YHPlFY6Stsy+ekKMLsMjyjdnmvXogx2xJpdezGM/ GtaGZMe4nl5Y0ZclMD8q/R8Y+VU1hFOSh2GGUDdGTlOEqb1E8EAiPPjc6YvfH6LOkolD P5TI7VD2ILniW4EjGWkEKIPL4lVApDP1GVoo11qGfioaMfqYlLYjaZJyTyegnQLUvV8K 9VQ1jXZJqjvIcuJ0Uc20QsM95+ZznWNInBnou8iv0XirTb5HI8/0riuZsZmVLU0BU+vm pOCbos//McDeRoxsglO6iQ8umSbg4E0dB7uDoe4IE4cQPbvF/IzPV7h0F/DYIL2zmCV4 W1nw== 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:mime-version :content-transfer-encoding; bh=tWYbNtmjE1k1tu/MG+O0SFJsDideswIxOdaCbUQYasE=; b=KgUfLPAM8Vv/1VYqwIcOee0OMEaCIN2gqyn9zlOeNKq582UH1UnHL0iTqG/BzTtN3Z sWPi8L/a8ElWm968i6LgfwcwkC4izU189K1Cd8M6lXHMqb0sxT32iAs5t/6u7adcVX3x BwAWRV4OkIFvlOgCWI0MDxtuTsHRcEsBLOg/7ylCQZgOcTeF1njQIb6QLp5LoeSv4hPH cONETbJiEGUTdtgMa9QTvJKz6l1DEE8lB7X/7uE29p+RtK/OSi6d5gmvMD8RUqCdlDlN nYpJLlUBeKA6LDaR4gUMY7iCwZlGRVlw2QVtjk2tig5LOl0HPHgkW6FtLaltuHYTo8BV 7Brw== X-Gm-Message-State: APjAAAWizWBydvylgWBf+aC7S9tazg8aLxNEyA6fUeAnnnawYGDzKRkv fROzCPr/tNMQVepuy4CXiRYHQ2Od X-Google-Smtp-Source: APXvYqxDOsjZw2MrMD89MTU/Yx7aNmuQbi22YJCxYY94JXex1TJ4Y86oE98mc8cKHbfxjvCkPAlp5g== X-Received: by 2002:a17:902:1aa:: with SMTP id b39mr27712195plb.333.1565502354929; Sat, 10 Aug 2019 22:45:54 -0700 (PDT) Received: from localhost.lan (c-67-185-54-80.hsd1.wa.comcast.net. [67.185.54.80]) by smtp.gmail.com with ESMTPSA id u16sm10998429pjb.2.2019.08.10.22.45.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 10 Aug 2019 22:45:54 -0700 (PDT) From: Andrey Smirnov To: linux-iio@vger.kernel.org Cc: Andrey Smirnov , linux-kernel@vger.kernel.org, Jonathan Cameron , Chris Healy Subject: [PATCH] iio: hi8435: Drop hi8435_remove() Date: Sat, 10 Aug 2019 22:45:45 -0700 Message-Id: <20190811054545.6922-1-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert the remainder of hi8435_probe() to use devres and get rid of hi8435_remove(). Signed-off-by: Andrey Smirnov Cc: linux-kernel@vger.kernel.org Cc: linux-iio@vger.kernel.org Cc: Jonathan Cameron Cc: Chris Healy --- drivers/iio/adc/hi8435.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/drivers/iio/adc/hi8435.c b/drivers/iio/adc/hi8435.c index c15f0e154e4d..fe1341383d30 100644 --- a/drivers/iio/adc/hi8435.c +++ b/drivers/iio/adc/hi8435.c @@ -456,6 +456,11 @@ static irqreturn_t hi8435_trigger_handler(int irq, void *private) return IRQ_HANDLED; } +static void hi8435_triggered_event_cleanup(void *data) +{ + iio_triggered_event_cleanup(data); +} + static int hi8435_probe(struct spi_device *spi) { struct iio_dev *idev; @@ -513,26 +518,18 @@ static int hi8435_probe(struct spi_device *spi) if (ret) return ret; - ret = iio_device_register(idev); + ret = devm_add_action_or_reset(&spi->dev, + hi8435_triggered_event_cleanup, + idev); + if (ret) + return ret; + + ret = devm_iio_device_register(&spi->dev, idev); if (ret < 0) { dev_err(&spi->dev, "unable to register device\n"); - goto unregister_triggered_event; + return ret; } - return 0; - -unregister_triggered_event: - iio_triggered_event_cleanup(idev); - return ret; -} - -static int hi8435_remove(struct spi_device *spi) -{ - struct iio_dev *idev = spi_get_drvdata(spi); - - iio_device_unregister(idev); - iio_triggered_event_cleanup(idev); - return 0; } @@ -554,7 +551,6 @@ static struct spi_driver hi8435_driver = { .of_match_table = of_match_ptr(hi8435_dt_ids), }, .probe = hi8435_probe, - .remove = hi8435_remove, .id_table = hi8435_id, }; module_spi_driver(hi8435_driver);