From patchwork Wed May 12 14:41:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 435619 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5071471jao; Wed, 12 May 2021 11:20:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfTlO+ixGyxtP5l9YluZRwQReRWkMcqmskNbETb6IjQqW5Qjot3tRaVNxosbDz1aljppD1 X-Received: by 2002:a02:cd8d:: with SMTP id l13mr34439968jap.7.1620843605776; Wed, 12 May 2021 11:20:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620843605; cv=none; d=google.com; s=arc-20160816; b=Ac/B7UoT3nkTk9bV1LOSy1FNP4nROGNYA7rpepITtoAdhRX4CFsogr/FWlKGSmh+vv cLME2g394ncGpthHQ0ggeug2KRDz3SQ06FLrFzN49XO2elRG0/TxcJzPEr612zTVroaw gNmOPu6JraKd5mQcGUmxcl84gogxhydL4pBZAVbr+d2vhaJbVK8s3jMFuUL3/IcTZ6lT gHnPWdhegVzA4tx/6buULXUUXa1hKIK0tra6E2AXo2HbX3zoLm3WKxuhiaCsFwmFPin/ C8FUlfLxTCvRVFnpbqjq/1oFkDetaht0oDfY2Xtv4+yWIWnemLvoDPcABrdajkoSVuXb vtvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7BGwEX0raNDaLaRi6xEcO20j6AQtJCFL58mrBdAAfBI=; b=j8I/BKlHAgV/Bg5D7Oqt5H7Nfk3Qdblz66P4hzQEkV9FGnBA1CJuWWAXJFATpVu4ER /EsOfkezR/fRKoAvjsUqwEgjaYCh7PZaDUkjiY0ySw8SL3vTmn5H9RMEfxP56fFJCRn1 Ree81ORRmKvP4csMqc7T+YyNoGLBYw0C56Hm1KQII9Almf081g70qFrbLQZre5Zhru2R 4Y4mdKGz/V6fGH7xCP+nZiw5Li6TSHyZ2rCoqwJenb5wiwNPG9ZyXjdLfQVNClrBVvz+ V6iDzndTdCB90s3ci56Lt0asBtcM5m6MzxHnFIDj7hBjdz2tYL42pUL9KEEiUGg/aq/z Al5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=andAGdTS; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q8si330223ior.12.2021.05.12.11.20.05; Wed, 12 May 2021 11:20:05 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=andAGdTS; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235139AbhELQc4 (ORCPT + 12 others); Wed, 12 May 2021 12:32:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:43080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241289AbhELQ07 (ORCPT ); Wed, 12 May 2021 12:26:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9B10461624; Wed, 12 May 2021 15:51:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834684; bh=wxD8AFbGpoOfeXevNcUMJoCvT6v6q1kwq9vR7kQkreE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=andAGdTS5k5yzq+qw7W3wcUkG7EKmhrllp1H/zdMkPPgh3hyCsBGk9VT3xzQ8+Uz/ pAQGyQN+7ntHrI/3/Uhc3KZqIIwUs024TORGUOA1T5ddtjsxQVrgh78M3VTgBcM1Z3 oiHLxWlKVYNS7gxKdb+wV7Z5D5QXMKe3qSTNefFg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Michael Hennerich , Alexandru Ardelean , Stable@vger.kernel.org Subject: [PATCH 5.12 043/677] iio:adc:ad7476: Fix remove handling Date: Wed, 12 May 2021 16:41:29 +0200 Message-Id: <20210512144838.637566867@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Cameron commit 6baee4bd63f5fdf1716f88e95c21a683e94fe30d upstream. This driver was in an odd half way state between devm based cleanup and manual cleanup (most of which was missing). I would guess something went wrong with a rebase or similar. Anyhow, this basically finishes the job as a precursor to improving the regulator handling. Signed-off-by: Jonathan Cameron Fixes: 4bb2b8f94ace3 ("iio: adc: ad7476: implement devm_add_action_or_reset") Cc: Michael Hennerich Reviewed-by: Alexandru Ardelean Cc: Link: https://lore.kernel.org/r/20210401171759.318140-2-jic23@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/iio/adc/ad7476.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) --- a/drivers/iio/adc/ad7476.c +++ b/drivers/iio/adc/ad7476.c @@ -321,25 +321,15 @@ static int ad7476_probe(struct spi_devic spi_message_init(&st->msg); spi_message_add_tail(&st->xfer, &st->msg); - ret = iio_triggered_buffer_setup(indio_dev, NULL, - &ad7476_trigger_handler, NULL); + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, NULL, + &ad7476_trigger_handler, NULL); if (ret) - goto error_disable_reg; + return ret; if (st->chip_info->reset) st->chip_info->reset(st); - ret = iio_device_register(indio_dev); - if (ret) - goto error_ring_unregister; - return 0; - -error_ring_unregister: - iio_triggered_buffer_cleanup(indio_dev); -error_disable_reg: - regulator_disable(st->reg); - - return ret; + return devm_iio_device_register(&spi->dev, indio_dev); } static const struct spi_device_id ad7476_id[] = {