Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp82726imm; Thu, 30 Aug 2018 08:50:02 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaFWAmzF+RFT84npjSU19lin8N6zi5xC7rzq5u3I7nifWJG+A/m/es+P7EPj887JXmtY4IC X-Received: by 2002:aa7:881a:: with SMTP id c26-v6mr10942039pfo.82.1535644201977; Thu, 30 Aug 2018 08:50:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535644201; cv=none; d=google.com; s=arc-20160816; b=yp0jDOaYpkvgPwREh89uW+OM4sPIZGMq6FlXtYg3j5G1FSQPTMDN+XfZwBVkRmJ5CW US84YbLkBjkJXu9yvwwfac1NmYCYmTlJkDYfbyYcGhLmHn/biQpZ4H3KnVySce6ox48D KH6sixH3LEo3UsJOq0/a2+/eWVRX1fCpH4t+YogIESN5RQsomSEjwJduP0/SJUutAq7G qHWe1Mv2AWzfIODp54ZggP1AfcSqmFzxLIdARhrSg5dZ8dhmus+HSXzh9E7goIL3RBhF sY9Rg5O+s232vw/46Vmk6dMVGe8Uar7WrJgqcdSCGY3MXCEd1kZrXeMyjJKJ4uR8jtfJ MIcA== 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=C/2oeBXZG2toeVaxCNErDpJ78AmhA9HYwAbujF41JBk=; b=rhwTQKJHywVG5aJ1VFOuPtFlLcQcN1y6WMj7+mTvNBeVXS4S7YY46taiVDlyx6UH9g FXREyKfV+E857A5oGbk/1Gz0NXrlr8NrWPprvuLZZ/E97QaVFHtNLUEqmRPpHppbElpa 8l7c2H05cU/qCB1Rg2LPUc2iL6sdid+CuzQIW7pEk9u1YvioY8ruP8BtKdPHe2ZmU8rS 8lwo4G9quLZIZP42qlA2NosOu8L9D20ADzQaiGHf2GmPcovJkJeAPxfEHIgzj2tc1+m8 BDAg4sNBrgwimwpPq/aLXsJv/4g6+9bta61pirVakOa38s/cc5rlDYE/+LKBtXI+0JIE sdcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=HRuOW3x+; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p11-v6si7131176pgh.274.2018.08.30.08.49.46; Thu, 30 Aug 2018 08:50:01 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=HRuOW3x+; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727983AbeH3Tuq (ORCPT + 99 others); Thu, 30 Aug 2018 15:50:46 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:37044 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727552AbeH3TsM (ORCPT ); Thu, 30 Aug 2018 15:48:12 -0400 Received: by mail-wm0-f67.google.com with SMTP id n11-v6so2499231wmc.2; Thu, 30 Aug 2018 08:45:26 -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:in-reply-to:references; bh=C/2oeBXZG2toeVaxCNErDpJ78AmhA9HYwAbujF41JBk=; b=HRuOW3x+mL/ZvNRvFqJCIIeFQQNu9h/tJfKgB5v3MbBkDgBtiof62xHrmjNnc7pYqM iTmH5yX5OTmpd7WIYd2t0hm1AfJfJvvOpii7hA6Wv2/PWlQ9cqlCMLulmuinfmcFv+RI FIT2tBUcQUgWT9yDCNYl6zr2GmD6DCH9H2L4zUOXIIs8fJ9AvVTym/37wuYHDGtPZbVK RZ8zZMjrAKBIetYy4PLEIcqAI+bs3IzgFq0l2awbp4HQ9fJGd+oNltqacQQtJrgh0fcq 3agh3monCyBTiiB8J8OKohDiQND+UWp9FKkwTBMYLSKctOwVxhFnING93jk6AhWF8HiD pqcw== 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=C/2oeBXZG2toeVaxCNErDpJ78AmhA9HYwAbujF41JBk=; b=A4Ai7xlPSEEB6i4SN/DJmt7Mbf+2q6Bkdok3IHe7tD+mYmJEreSCrn+pW7o6V39EMI 2WHyYHvm0P6LWSTQBY+qnpxKSxTkPca+swDpFTSxjJqaVTQzRYmt7Yr+GSChkeOWQZyx eOz1Yer56heGUFAaEoNwILrkIB/a7sIGLoztRbnpSgrZhBMFXhZzkSsdOOGUXBZK9UjW akThRaReYfV5mO//6q5nX/iEpz0BPAOa/JYOAWjIfqFbNzU91oJHhoaGZe5Pflo8wTPl ylN/Xwx1qYl8i7ZtypndPIsYB7s+cuGtMXp574Px9QaQvlXGCT1vFtOfRzectWq6xsaC rPHQ== X-Gm-Message-State: APzg51DgoTJvO/gWLxiNPri1JXaBSEwCA8FO8NcQeaCMp+ArIukjdC/8 hyfgEeoBoxWDwt+HUPmbBv4= X-Received: by 2002:a1c:64c:: with SMTP id 73-v6mr2090110wmg.7.1535643925668; Thu, 30 Aug 2018 08:45:25 -0700 (PDT) Received: from debian-hp.wlan.uni-ulm.de (eduroam170-020.wlan.uni-ulm.de. [134.60.170.20]) by smtp.gmail.com with ESMTPSA id j20-v6sm1362759wmh.9.2018.08.30.08.45.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 08:45:25 -0700 (PDT) From: Philipp Rossak To: lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, maxime.ripard@bootlin.com, wens@csie.org, linux@armlinux.org.uk, jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, eugen.hristev@microchip.com, rdunlap@infradead.org, vilhelm.gray@gmail.com, clabbe.montjoie@gmail.com, quentin.schulz@bootlin.com, geert+renesas@glider.be, lukas@wunner.de, icenowy@aosc.io, arnd@arndb.de, broonie@kernel.org, arnaud.pouliquen@st.com Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com Subject: [PATCH v3 06/30] iio: adc: remove ofnode options Date: Thu, 30 Aug 2018 17:44:54 +0200 Message-Id: <20180830154518.29507-7-embed3d@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180830154518.29507-1-embed3d@gmail.com> References: <20180830154518.29507-1-embed3d@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since we are merging the mfd dirver into the adc driver we don't need two different probing functions. Thus we remove the ofnode options Signed-off-by: Philipp Rossak --- drivers/iio/adc/sun4i-gpadc-iio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c index 666329940e1e..d6f00d3b802d 100644 --- a/drivers/iio/adc/sun4i-gpadc-iio.c +++ b/drivers/iio/adc/sun4i-gpadc-iio.c @@ -622,10 +622,7 @@ static int sun4i_gpadc_probe(struct platform_device *pdev) indio_dev->info = &sun4i_gpadc_iio_info; indio_dev->modes = INDIO_DIRECT_MODE; - if (pdev->dev.of_node) - ret = sun4i_gpadc_probe_dt(pdev, indio_dev); - else - ret = sun4i_gpadc_probe_mfd(pdev, indio_dev); + ret = sun4i_gpadc_probe_dt(pdev, indio_dev); if (ret) return ret; -- 2.11.0