From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-00128a01.pphosted.com (mx0a-00128a01.pphosted.com [148.163.135.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60F9C7C for ; Fri, 10 Jun 2022 08:49:11 +0000 (UTC) Received: from pps.filterd (m0167089.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25A7WKNk005267; Fri, 10 Jun 2022 04:48:49 -0400 Received: from nwd2mta4.analog.com ([137.71.173.58]) by mx0a-00128a01.pphosted.com (PPS) with ESMTPS id 3ghq33kqd1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Jun 2022 04:48:49 -0400 Received: from ASHBMBX8.ad.analog.com (ASHBMBX8.ad.analog.com [10.64.17.5]) by nwd2mta4.analog.com (8.14.7/8.14.7) with ESMTP id 25A8mmcR027571 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 10 Jun 2022 04:48:48 -0400 Received: from ASHBMBX9.ad.analog.com (10.64.17.10) by ASHBMBX8.ad.analog.com (10.64.17.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.14; Fri, 10 Jun 2022 04:48:47 -0400 Received: from zeus.spd.analog.com (10.66.68.11) by ashbmbx9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server id 15.2.986.14 via Frontend Transport; Fri, 10 Jun 2022 04:48:47 -0400 Received: from nsa.ad.analog.com ([10.44.3.70]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 25A8imip014275; Fri, 10 Jun 2022 04:48:38 -0400 From: =?UTF-8?q?Nuno=20S=C3=A1?= To: , , , , , Lad Prabhakar , , , , , CC: Cai Huoqing , Benjamin Fair , Jishnu Prakash , Linus Walleij , Lars-Peter Clausen , Alexandre Torgue , Amit Kucheria , Andy Gross , Michael Hennerich , Haibo Chen , Benson Leung , "Rafael J. Wysocki" , Alexandre Belloni , Christophe Branchereau , Patrick Venture , Arnd Bergmann , Nancy Yuen , Sascha Hauer , Daniel Lezcano , Gwendal Grignou , Saravanan Sekar , Tali Perry , Maxime Coquelin , Paul Cercueil , Thara Gopinath , Avi Fishman , Lorenzo Bianconi , Claudiu Beznea , Pengutronix Kernel Team , Andy Shevchenko , Fabrice Gasnier , Matthias Brugger , Tomer Maimon , Bjorn Andersson , Nicolas Ferre , Jonathan Cameron , Zhang Rui , Shawn Guo , Guenter Roeck , Fabio Estevam , Olivier Moysan , Eugen Hristev , Miquel Raynal Subject: [PATCH 29/34] iio: adc: qcom-pm8xxx-xoadc: convert to device properties Date: Fri, 10 Jun 2022 10:45:40 +0200 Message-ID: <20220610084545.547700-30-nuno.sa@analog.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220610084545.547700-1-nuno.sa@analog.com> References: <20220610084545.547700-1-nuno.sa@analog.com> Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-ADIRuleOP-NewSCL: Rule Triggered X-Proofpoint-ORIG-GUID: 7uL_5UJKLscvZ6dGNIIIrg8LReX_O-ks X-Proofpoint-GUID: 7uL_5UJKLscvZ6dGNIIIrg8LReX_O-ks X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-10_02,2022-06-09_02,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxlogscore=999 phishscore=0 priorityscore=1501 adultscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 spamscore=0 impostorscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206100032 Make the conversion to firmware agnostic device properties. As part of the conversion the IIO inkern interface 'of_xlate()' is also converted to 'fwnode_xlate()'. The goal is to completely drop 'of_xlate' and hence OF dependencies from IIO. Signed-off-by: Nuno Sá --- drivers/iio/adc/qcom-pm8xxx-xoadc.c | 58 ++++++++++++++--------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/drivers/iio/adc/qcom-pm8xxx-xoadc.c b/drivers/iio/adc/qcom-pm8xxx-xoadc.c index 5e9e56821075..eb424496ee1d 100644 --- a/drivers/iio/adc/qcom-pm8xxx-xoadc.c +++ b/drivers/iio/adc/qcom-pm8xxx-xoadc.c @@ -14,9 +14,9 @@ #include #include #include -#include -#include +#include #include +#include #include #include #include @@ -694,8 +694,8 @@ static int pm8xxx_read_raw(struct iio_dev *indio_dev, } } -static int pm8xxx_of_xlate(struct iio_dev *indio_dev, - const struct of_phandle_args *iiospec) +static int pm8xxx_fwnode_xlate(struct iio_dev *indio_dev, + const struct fwnode_reference_args *iiospec) { struct pm8xxx_xoadc *adc = iio_priv(indio_dev); u8 pre_scale_mux; @@ -706,10 +706,10 @@ static int pm8xxx_of_xlate(struct iio_dev *indio_dev, * First cell is prescaler or premux, second cell is analog * mux. */ - if (iiospec->args_count != 2) { - dev_err(&indio_dev->dev, "wrong number of arguments for %pOFn need 2 got %d\n", - iiospec->np, - iiospec->args_count); + if (iiospec->nargs != 2) { + dev_err(&indio_dev->dev, "wrong number of arguments for %pfwP need 2 got %d\n", + iiospec->fwnode, + iiospec->nargs); return -EINVAL; } pre_scale_mux = (u8)iiospec->args[0]; @@ -727,34 +727,34 @@ static int pm8xxx_of_xlate(struct iio_dev *indio_dev, } static const struct iio_info pm8xxx_xoadc_info = { - .of_xlate = pm8xxx_of_xlate, + .fwnode_xlate = pm8xxx_fwnode_xlate, .read_raw = pm8xxx_read_raw, }; static int pm8xxx_xoadc_parse_channel(struct device *dev, - struct device_node *np, + struct fwnode_handle *fwnode, const struct xoadc_channel *hw_channels, struct iio_chan_spec *iio_chan, struct pm8xxx_chan_info *ch) { - const char *name = np->name; + const char *name = fwnode_get_name(fwnode); const struct xoadc_channel *hwchan; - u32 pre_scale_mux, amux_channel; + u32 pre_scale_mux, amux_channel, reg[2]; u32 rsv, dec; int ret; int chid; - ret = of_property_read_u32_index(np, "reg", 0, &pre_scale_mux); + ret = fwnode_property_read_u32_array(fwnode, "reg", reg, + ARRAY_SIZE(reg)); if (ret) { - dev_err(dev, "invalid pre scale/mux number %s\n", name); - return ret; - } - ret = of_property_read_u32_index(np, "reg", 1, &amux_channel); - if (ret) { - dev_err(dev, "invalid amux channel number %s\n", name); + dev_err(dev, "invalid pre scale/mux or amux channel number %s\n", + name); return ret; } + pre_scale_mux = reg[0]; + amux_channel = reg[1]; + /* Find the right channel setting */ chid = 0; hwchan = &hw_channels[0]; @@ -778,7 +778,7 @@ static int pm8xxx_xoadc_parse_channel(struct device *dev, /* Everyone seems to use default ("type 2") decimation */ ch->decimation = VADC_DEF_DECIMATION; - if (!of_property_read_u32(np, "qcom,ratiometric", &rsv)) { + if (!fwnode_property_read_u32(fwnode, "qcom,ratiometric", &rsv)) { ch->calibration = VADC_CALIB_RATIOMETRIC; if (rsv > XOADC_RSV_MAX) { dev_err(dev, "%s too large RSV value %d\n", name, rsv); @@ -791,7 +791,7 @@ static int pm8xxx_xoadc_parse_channel(struct device *dev, } /* Optional decimation, if omitted we use the default */ - ret = of_property_read_u32(np, "qcom,decimation", &dec); + ret = fwnode_property_read_u32(fwnode, "qcom,decimation", &dec); if (!ret) { ret = qcom_vadc_decimation_from_dt(dec); if (ret < 0) { @@ -820,15 +820,14 @@ static int pm8xxx_xoadc_parse_channel(struct device *dev, return 0; } -static int pm8xxx_xoadc_parse_channels(struct pm8xxx_xoadc *adc, - struct device_node *np) +static int pm8xxx_xoadc_parse_channels(struct pm8xxx_xoadc *adc) { - struct device_node *child; + struct fwnode_handle *child; struct pm8xxx_chan_info *ch; int ret; int i; - adc->nchans = of_get_available_child_count(np); + adc->nchans = device_get_child_node_count(adc->dev); if (!adc->nchans) { dev_err(adc->dev, "no channel children\n"); return -ENODEV; @@ -846,14 +845,14 @@ static int pm8xxx_xoadc_parse_channels(struct pm8xxx_xoadc *adc, return -ENOMEM; i = 0; - for_each_available_child_of_node(np, child) { + device_for_each_child_node(adc->dev, child) { ch = &adc->chans[i]; ret = pm8xxx_xoadc_parse_channel(adc->dev, child, adc->variant->channels, &adc->iio_chans[i], ch); if (ret) { - of_node_put(child); + fwnode_handle_put(child); return ret; } i++; @@ -884,12 +883,11 @@ static int pm8xxx_xoadc_probe(struct platform_device *pdev) const struct xoadc_variant *variant; struct pm8xxx_xoadc *adc; struct iio_dev *indio_dev; - struct device_node *np = pdev->dev.of_node; struct regmap *map; struct device *dev = &pdev->dev; int ret; - variant = of_device_get_match_data(dev); + variant = device_get_match_data(dev); if (!variant) return -ENODEV; @@ -904,7 +902,7 @@ static int pm8xxx_xoadc_probe(struct platform_device *pdev) init_completion(&adc->complete); mutex_init(&adc->lock); - ret = pm8xxx_xoadc_parse_channels(adc, np); + ret = pm8xxx_xoadc_parse_channels(adc); if (ret) return ret; -- 2.36.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58790CCA47B for ; Fri, 10 Jun 2022 08:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XNKXXFmkJUZWcMBxLIyeoebI1I2kZ3EHlAFiPAPYuIw=; b=XqHCvkP8qF5WPZ IcWzb2ePGewuM0IWPxtEYgTFXlwq2c4G6MJ6fbR8kF1KbICUiRFLeAxbsk6AOrHnQyOGn/DCCSGjM juiaCPuF5nV9Zd3LW43sIsTwIDinSXVJ+9UJ2gS/abwdVXqmLDuz48HHYqcAfB2V8IrcoYZlxqfSa or86UIigCgLolXYvIEQZi4tQ1mnbLy34TQeaY7buPNV2bTbw0zD+USJzTScrNhJKV7OHKkIfzbjyP ZELXd3JnYqHy3QgokR9nfvXtA0ZfRV9qYBGraP9tmxS2RLyB/TXZv9f6tzFNgjTjNrsTq5a6r8IFU qXjvGy2rGS71+5D0YAzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzaKQ-006v7T-Ir; Fri, 10 Jun 2022 08:49:14 +0000 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzaKL-006v3O-3x; Fri, 10 Jun 2022 08:49:10 +0000 Received: from pps.filterd (m0167089.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25A7WKNk005267; Fri, 10 Jun 2022 04:48:49 -0400 Received: from nwd2mta4.analog.com ([137.71.173.58]) by mx0a-00128a01.pphosted.com (PPS) with ESMTPS id 3ghq33kqd1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Jun 2022 04:48:49 -0400 Received: from ASHBMBX8.ad.analog.com (ASHBMBX8.ad.analog.com [10.64.17.5]) by nwd2mta4.analog.com (8.14.7/8.14.7) with ESMTP id 25A8mmcR027571 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 10 Jun 2022 04:48:48 -0400 Received: from ASHBMBX9.ad.analog.com (10.64.17.10) by ASHBMBX8.ad.analog.com (10.64.17.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.14; Fri, 10 Jun 2022 04:48:47 -0400 Received: from zeus.spd.analog.com (10.66.68.11) by ashbmbx9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server id 15.2.986.14 via Frontend Transport; Fri, 10 Jun 2022 04:48:47 -0400 Received: from nsa.ad.analog.com ([10.44.3.70]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 25A8imip014275; Fri, 10 Jun 2022 04:48:38 -0400 From: =?UTF-8?q?Nuno=20S=C3=A1?= To: , , , , , Lad Prabhakar , , , , , CC: Cai Huoqing , Benjamin Fair , Jishnu Prakash , Linus Walleij , Lars-Peter Clausen , Alexandre Torgue , Amit Kucheria , Andy Gross , Michael Hennerich , Haibo Chen , Benson Leung , "Rafael J. Wysocki" , Alexandre Belloni , Christophe Branchereau , Patrick Venture , Arnd Bergmann , Nancy Yuen , Sascha Hauer , Daniel Lezcano , Gwendal Grignou , Saravanan Sekar , Tali Perry , Maxime Coquelin , Paul Cercueil , Thara Gopinath , Avi Fishman , Lorenzo Bianconi , Claudiu Beznea , Pengutronix Kernel Team , Andy Shevchenko , Fabrice Gasnier , Matthias Brugger , Tomer Maimon , Bjorn Andersson , Nicolas Ferre , Jonathan Cameron , Zhang Rui , Shawn Guo , Guenter Roeck , Fabio Estevam , Olivier Moysan , Eugen Hristev , Miquel Raynal Subject: [PATCH 29/34] iio: adc: qcom-pm8xxx-xoadc: convert to device properties Date: Fri, 10 Jun 2022 10:45:40 +0200 Message-ID: <20220610084545.547700-30-nuno.sa@analog.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220610084545.547700-1-nuno.sa@analog.com> References: <20220610084545.547700-1-nuno.sa@analog.com> MIME-Version: 1.0 X-ADIRuleOP-NewSCL: Rule Triggered X-Proofpoint-ORIG-GUID: 7uL_5UJKLscvZ6dGNIIIrg8LReX_O-ks X-Proofpoint-GUID: 7uL_5UJKLscvZ6dGNIIIrg8LReX_O-ks X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-10_02,2022-06-09_02,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxlogscore=999 phishscore=0 priorityscore=1501 adultscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 spamscore=0 impostorscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206100032 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220610_014909_226469_AD151631 X-CRM114-Status: GOOD ( 21.09 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org TWFrZSB0aGUgY29udmVyc2lvbiB0byBmaXJtd2FyZSBhZ25vc3RpYyBkZXZpY2UgcHJvcGVydGll cy4gQXMgcGFydCBvZgp0aGUgY29udmVyc2lvbiB0aGUgSUlPIGlua2VybiBpbnRlcmZhY2UgJ29m X3hsYXRlKCknIGlzIGFsc28gY29udmVydGVkIHRvCidmd25vZGVfeGxhdGUoKScuIFRoZSBnb2Fs IGlzIHRvIGNvbXBsZXRlbHkgZHJvcCAnb2ZfeGxhdGUnIGFuZCBoZW5jZSBPRgpkZXBlbmRlbmNp ZXMgZnJvbSBJSU8uCgpTaWduZWQtb2ZmLWJ5OiBOdW5vIFPDoSA8bnVuby5zYUBhbmFsb2cuY29t PgotLS0KIGRyaXZlcnMvaWlvL2FkYy9xY29tLXBtOHh4eC14b2FkYy5jIHwgNTggKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAz MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2lpby9hZGMvcWNvbS1wbTh4eHgt eG9hZGMuYyBiL2RyaXZlcnMvaWlvL2FkYy9xY29tLXBtOHh4eC14b2FkYy5jCmluZGV4IDVlOWU1 NjgyMTA3NS4uZWI0MjQ0OTZlZTFkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2lpby9hZGMvcWNvbS1w bTh4eHgteG9hZGMuYworKysgYi9kcml2ZXJzL2lpby9hZGMvcWNvbS1wbTh4eHgteG9hZGMuYwpA QCAtMTQsOSArMTQsOSBAQAogI2luY2x1ZGUgPGxpbnV4L2lpby9paW8uaD4KICNpbmNsdWRlIDxs aW51eC9paW8vc3lzZnMuaD4KICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KLSNpbmNsdWRlIDxs aW51eC9vZi5oPgotI2luY2x1ZGUgPGxpbnV4L29mX2RldmljZS5oPgorI2luY2x1ZGUgPGxpbnV4 L21vZF9kZXZpY2V0YWJsZS5oPgogI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPgor I2luY2x1ZGUgPGxpbnV4L3Byb3BlcnR5Lmg+CiAjaW5jbHVkZSA8bGludXgvcmVnbWFwLmg+CiAj aW5jbHVkZSA8bGludXgvaW5pdC5oPgogI2luY2x1ZGUgPGxpbnV4L2ludGVycnVwdC5oPgpAQCAt Njk0LDggKzY5NCw4IEBAIHN0YXRpYyBpbnQgcG04eHh4X3JlYWRfcmF3KHN0cnVjdCBpaW9fZGV2 ICppbmRpb19kZXYsCiAJfQogfQogCi1zdGF0aWMgaW50IHBtOHh4eF9vZl94bGF0ZShzdHJ1Y3Qg aWlvX2RldiAqaW5kaW9fZGV2LAotCQkJICAgY29uc3Qgc3RydWN0IG9mX3BoYW5kbGVfYXJncyAq aWlvc3BlYykKK3N0YXRpYyBpbnQgcG04eHh4X2Z3bm9kZV94bGF0ZShzdHJ1Y3QgaWlvX2RldiAq aW5kaW9fZGV2LAorCQkJICAgICAgIGNvbnN0IHN0cnVjdCBmd25vZGVfcmVmZXJlbmNlX2FyZ3Mg Kmlpb3NwZWMpCiB7CiAJc3RydWN0IHBtOHh4eF94b2FkYyAqYWRjID0gaWlvX3ByaXYoaW5kaW9f ZGV2KTsKIAl1OCBwcmVfc2NhbGVfbXV4OwpAQCAtNzA2LDEwICs3MDYsMTAgQEAgc3RhdGljIGlu dCBwbTh4eHhfb2ZfeGxhdGUoc3RydWN0IGlpb19kZXYgKmluZGlvX2RldiwKIAkgKiBGaXJzdCBj ZWxsIGlzIHByZXNjYWxlciBvciBwcmVtdXgsIHNlY29uZCBjZWxsIGlzIGFuYWxvZwogCSAqIG11 eC4KIAkgKi8KLQlpZiAoaWlvc3BlYy0+YXJnc19jb3VudCAhPSAyKSB7Ci0JCWRldl9lcnIoJmlu ZGlvX2Rldi0+ZGV2LCAid3JvbmcgbnVtYmVyIG9mIGFyZ3VtZW50cyBmb3IgJXBPRm4gbmVlZCAy IGdvdCAlZFxuIiwKLQkJCWlpb3NwZWMtPm5wLAotCQkJaWlvc3BlYy0+YXJnc19jb3VudCk7CisJ aWYgKGlpb3NwZWMtPm5hcmdzICE9IDIpIHsKKwkJZGV2X2VycigmaW5kaW9fZGV2LT5kZXYsICJ3 cm9uZyBudW1iZXIgb2YgYXJndW1lbnRzIGZvciAlcGZ3UCBuZWVkIDIgZ290ICVkXG4iLAorCQkJ aWlvc3BlYy0+Zndub2RlLAorCQkJaWlvc3BlYy0+bmFyZ3MpOwogCQlyZXR1cm4gLUVJTlZBTDsK IAl9CiAJcHJlX3NjYWxlX211eCA9ICh1OClpaW9zcGVjLT5hcmdzWzBdOwpAQCAtNzI3LDM0ICs3 MjcsMzQgQEAgc3RhdGljIGludCBwbTh4eHhfb2ZfeGxhdGUoc3RydWN0IGlpb19kZXYgKmluZGlv X2RldiwKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpaW9faW5mbyBwbTh4eHhfeG9hZGNfaW5m byA9IHsKLQkub2ZfeGxhdGUgPSBwbTh4eHhfb2ZfeGxhdGUsCisJLmZ3bm9kZV94bGF0ZSA9IHBt OHh4eF9md25vZGVfeGxhdGUsCiAJLnJlYWRfcmF3ID0gcG04eHh4X3JlYWRfcmF3LAogfTsKIAog c3RhdGljIGludCBwbTh4eHhfeG9hZGNfcGFyc2VfY2hhbm5lbChzdHJ1Y3QgZGV2aWNlICpkZXYs Ci0JCQkJICAgICAgc3RydWN0IGRldmljZV9ub2RlICpucCwKKwkJCQkgICAgICBzdHJ1Y3QgZndu b2RlX2hhbmRsZSAqZndub2RlLAogCQkJCSAgICAgIGNvbnN0IHN0cnVjdCB4b2FkY19jaGFubmVs ICpod19jaGFubmVscywKIAkJCQkgICAgICBzdHJ1Y3QgaWlvX2NoYW5fc3BlYyAqaWlvX2NoYW4s CiAJCQkJICAgICAgc3RydWN0IHBtOHh4eF9jaGFuX2luZm8gKmNoKQogewotCWNvbnN0IGNoYXIg Km5hbWUgPSBucC0+bmFtZTsKKwljb25zdCBjaGFyICpuYW1lID0gZndub2RlX2dldF9uYW1lKGZ3 bm9kZSk7CiAJY29uc3Qgc3RydWN0IHhvYWRjX2NoYW5uZWwgKmh3Y2hhbjsKLQl1MzIgcHJlX3Nj YWxlX211eCwgYW11eF9jaGFubmVsOworCXUzMiBwcmVfc2NhbGVfbXV4LCBhbXV4X2NoYW5uZWws IHJlZ1syXTsKIAl1MzIgcnN2LCBkZWM7CiAJaW50IHJldDsKIAlpbnQgY2hpZDsKIAotCXJldCA9 IG9mX3Byb3BlcnR5X3JlYWRfdTMyX2luZGV4KG5wLCAicmVnIiwgMCwgJnByZV9zY2FsZV9tdXgp OworCXJldCA9IGZ3bm9kZV9wcm9wZXJ0eV9yZWFkX3UzMl9hcnJheShmd25vZGUsICJyZWciLCBy ZWcsCisJCQkJCSAgICAgQVJSQVlfU0laRShyZWcpKTsKIAlpZiAocmV0KSB7Ci0JCWRldl9lcnIo ZGV2LCAiaW52YWxpZCBwcmUgc2NhbGUvbXV4IG51bWJlciAlc1xuIiwgbmFtZSk7Ci0JCXJldHVy biByZXQ7Ci0JfQotCXJldCA9IG9mX3Byb3BlcnR5X3JlYWRfdTMyX2luZGV4KG5wLCAicmVnIiwg MSwgJmFtdXhfY2hhbm5lbCk7Ci0JaWYgKHJldCkgewotCQlkZXZfZXJyKGRldiwgImludmFsaWQg YW11eCBjaGFubmVsIG51bWJlciAlc1xuIiwgbmFtZSk7CisJCWRldl9lcnIoZGV2LCAiaW52YWxp ZCBwcmUgc2NhbGUvbXV4IG9yIGFtdXggY2hhbm5lbCBudW1iZXIgJXNcbiIsCisJCQluYW1lKTsK IAkJcmV0dXJuIHJldDsKIAl9CiAKKwlwcmVfc2NhbGVfbXV4ID0gcmVnWzBdOworCWFtdXhfY2hh bm5lbCA9IHJlZ1sxXTsKKwogCS8qIEZpbmQgdGhlIHJpZ2h0IGNoYW5uZWwgc2V0dGluZyAqLwog CWNoaWQgPSAwOwogCWh3Y2hhbiA9ICZod19jaGFubmVsc1swXTsKQEAgLTc3OCw3ICs3NzgsNyBA QCBzdGF0aWMgaW50IHBtOHh4eF94b2FkY19wYXJzZV9jaGFubmVsKHN0cnVjdCBkZXZpY2UgKmRl diwKIAkvKiBFdmVyeW9uZSBzZWVtcyB0byB1c2UgZGVmYXVsdCAoInR5cGUgMiIpIGRlY2ltYXRp b24gKi8KIAljaC0+ZGVjaW1hdGlvbiA9IFZBRENfREVGX0RFQ0lNQVRJT047CiAKLQlpZiAoIW9m X3Byb3BlcnR5X3JlYWRfdTMyKG5wLCAicWNvbSxyYXRpb21ldHJpYyIsICZyc3YpKSB7CisJaWYg KCFmd25vZGVfcHJvcGVydHlfcmVhZF91MzIoZndub2RlLCAicWNvbSxyYXRpb21ldHJpYyIsICZy c3YpKSB7CiAJCWNoLT5jYWxpYnJhdGlvbiA9IFZBRENfQ0FMSUJfUkFUSU9NRVRSSUM7CiAJCWlm IChyc3YgPiBYT0FEQ19SU1ZfTUFYKSB7CiAJCQlkZXZfZXJyKGRldiwgIiVzIHRvbyBsYXJnZSBS U1YgdmFsdWUgJWRcbiIsIG5hbWUsIHJzdik7CkBAIC03OTEsNyArNzkxLDcgQEAgc3RhdGljIGlu dCBwbTh4eHhfeG9hZGNfcGFyc2VfY2hhbm5lbChzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJfQogCiAJ LyogT3B0aW9uYWwgZGVjaW1hdGlvbiwgaWYgb21pdHRlZCB3ZSB1c2UgdGhlIGRlZmF1bHQgKi8K LQlyZXQgPSBvZl9wcm9wZXJ0eV9yZWFkX3UzMihucCwgInFjb20sZGVjaW1hdGlvbiIsICZkZWMp OworCXJldCA9IGZ3bm9kZV9wcm9wZXJ0eV9yZWFkX3UzMihmd25vZGUsICJxY29tLGRlY2ltYXRp b24iLCAmZGVjKTsKIAlpZiAoIXJldCkgewogCQlyZXQgPSBxY29tX3ZhZGNfZGVjaW1hdGlvbl9m cm9tX2R0KGRlYyk7CiAJCWlmIChyZXQgPCAwKSB7CkBAIC04MjAsMTUgKzgyMCwxNCBAQCBzdGF0 aWMgaW50IHBtOHh4eF94b2FkY19wYXJzZV9jaGFubmVsKHN0cnVjdCBkZXZpY2UgKmRldiwKIAly ZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBwbTh4eHhfeG9hZGNfcGFyc2VfY2hhbm5lbHMoc3Ry dWN0IHBtOHh4eF94b2FkYyAqYWRjLAotCQkJCSAgICAgICBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5w KQorc3RhdGljIGludCBwbTh4eHhfeG9hZGNfcGFyc2VfY2hhbm5lbHMoc3RydWN0IHBtOHh4eF94 b2FkYyAqYWRjKQogewotCXN0cnVjdCBkZXZpY2Vfbm9kZSAqY2hpbGQ7CisJc3RydWN0IGZ3bm9k ZV9oYW5kbGUgKmNoaWxkOwogCXN0cnVjdCBwbTh4eHhfY2hhbl9pbmZvICpjaDsKIAlpbnQgcmV0 OwogCWludCBpOwogCi0JYWRjLT5uY2hhbnMgPSBvZl9nZXRfYXZhaWxhYmxlX2NoaWxkX2NvdW50 KG5wKTsKKwlhZGMtPm5jaGFucyA9IGRldmljZV9nZXRfY2hpbGRfbm9kZV9jb3VudChhZGMtPmRl dik7CiAJaWYgKCFhZGMtPm5jaGFucykgewogCQlkZXZfZXJyKGFkYy0+ZGV2LCAibm8gY2hhbm5l bCBjaGlsZHJlblxuIik7CiAJCXJldHVybiAtRU5PREVWOwpAQCAtODQ2LDE0ICs4NDUsMTQgQEAg c3RhdGljIGludCBwbTh4eHhfeG9hZGNfcGFyc2VfY2hhbm5lbHMoc3RydWN0IHBtOHh4eF94b2Fk YyAqYWRjLAogCQlyZXR1cm4gLUVOT01FTTsKIAogCWkgPSAwOwotCWZvcl9lYWNoX2F2YWlsYWJs ZV9jaGlsZF9vZl9ub2RlKG5wLCBjaGlsZCkgeworCWRldmljZV9mb3JfZWFjaF9jaGlsZF9ub2Rl KGFkYy0+ZGV2LCBjaGlsZCkgewogCQljaCA9ICZhZGMtPmNoYW5zW2ldOwogCQlyZXQgPSBwbTh4 eHhfeG9hZGNfcGFyc2VfY2hhbm5lbChhZGMtPmRldiwgY2hpbGQsCiAJCQkJCQkgYWRjLT52YXJp YW50LT5jaGFubmVscywKIAkJCQkJCSAmYWRjLT5paW9fY2hhbnNbaV0sCiAJCQkJCQkgY2gpOwog CQlpZiAocmV0KSB7Ci0JCQlvZl9ub2RlX3B1dChjaGlsZCk7CisJCQlmd25vZGVfaGFuZGxlX3B1 dChjaGlsZCk7CiAJCQlyZXR1cm4gcmV0OwogCQl9CiAJCWkrKzsKQEAgLTg4NCwxMiArODgzLDEx IEBAIHN0YXRpYyBpbnQgcG04eHh4X3hvYWRjX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KnBkZXYpCiAJY29uc3Qgc3RydWN0IHhvYWRjX3ZhcmlhbnQgKnZhcmlhbnQ7CiAJc3RydWN0IHBt OHh4eF94b2FkYyAqYWRjOwogCXN0cnVjdCBpaW9fZGV2ICppbmRpb19kZXY7Ci0Jc3RydWN0IGRl dmljZV9ub2RlICpucCA9IHBkZXYtPmRldi5vZl9ub2RlOwogCXN0cnVjdCByZWdtYXAgKm1hcDsK IAlzdHJ1Y3QgZGV2aWNlICpkZXYgPSAmcGRldi0+ZGV2OwogCWludCByZXQ7CiAKLQl2YXJpYW50 ID0gb2ZfZGV2aWNlX2dldF9tYXRjaF9kYXRhKGRldik7CisJdmFyaWFudCA9IGRldmljZV9nZXRf bWF0Y2hfZGF0YShkZXYpOwogCWlmICghdmFyaWFudCkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKQEAg LTkwNCw3ICs5MDIsNyBAQCBzdGF0aWMgaW50IHBtOHh4eF94b2FkY19wcm9iZShzdHJ1Y3QgcGxh dGZvcm1fZGV2aWNlICpwZGV2KQogCWluaXRfY29tcGxldGlvbigmYWRjLT5jb21wbGV0ZSk7CiAJ bXV0ZXhfaW5pdCgmYWRjLT5sb2NrKTsKIAotCXJldCA9IHBtOHh4eF94b2FkY19wYXJzZV9jaGFu bmVscyhhZGMsIG5wKTsKKwlyZXQgPSBwbTh4eHhfeG9hZGNfcGFyc2VfY2hhbm5lbHMoYWRjKTsK IAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0tIAoyLjM2LjEKCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eC1tZWRpYXRlayBtYWlsaW5nIGxp c3QKTGludXgtbWVkaWF0ZWtAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFk ZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LW1lZGlhdGVrCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 87F85C43334 for ; Thu, 16 Jun 2022 02:15:22 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4LNm3Y24trz3fK9 for ; Thu, 16 Jun 2022 12:15:21 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=analog.com (client-ip=148.163.135.77; helo=mx0a-00128a01.pphosted.com; envelope-from=nuno.sa@analog.com; receiver=) Received: from mx0a-00128a01.pphosted.com (mx0a-00128a01.pphosted.com [148.163.135.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4LKF4p26B3z3btK for ; Fri, 10 Jun 2022 18:49:13 +1000 (AEST) Received: from pps.filterd (m0167089.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25A7WKNk005267; Fri, 10 Jun 2022 04:48:49 -0400 Received: from nwd2mta4.analog.com ([137.71.173.58]) by mx0a-00128a01.pphosted.com (PPS) with ESMTPS id 3ghq33kqd1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Jun 2022 04:48:49 -0400 Received: from ASHBMBX8.ad.analog.com (ASHBMBX8.ad.analog.com [10.64.17.5]) by nwd2mta4.analog.com (8.14.7/8.14.7) with ESMTP id 25A8mmcR027571 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 10 Jun 2022 04:48:48 -0400 Received: from ASHBMBX9.ad.analog.com (10.64.17.10) by ASHBMBX8.ad.analog.com (10.64.17.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.14; Fri, 10 Jun 2022 04:48:47 -0400 Received: from zeus.spd.analog.com (10.66.68.11) by ashbmbx9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server id 15.2.986.14 via Frontend Transport; Fri, 10 Jun 2022 04:48:47 -0400 Received: from nsa.ad.analog.com ([10.44.3.70]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 25A8imip014275; Fri, 10 Jun 2022 04:48:38 -0400 From: =?UTF-8?q?Nuno=20S=C3=A1?= To: , , , , , Lad Prabhakar , , , , , Subject: [PATCH 29/34] iio: adc: qcom-pm8xxx-xoadc: convert to device properties Date: Fri, 10 Jun 2022 10:45:40 +0200 Message-ID: <20220610084545.547700-30-nuno.sa@analog.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220610084545.547700-1-nuno.sa@analog.com> References: <20220610084545.547700-1-nuno.sa@analog.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-ADIRuleOP-NewSCL: Rule Triggered X-Proofpoint-ORIG-GUID: 7uL_5UJKLscvZ6dGNIIIrg8LReX_O-ks X-Proofpoint-GUID: 7uL_5UJKLscvZ6dGNIIIrg8LReX_O-ks X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-10_02,2022-06-09_02,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxlogscore=999 phishscore=0 priorityscore=1501 adultscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 spamscore=0 impostorscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206100032 X-Mailman-Approved-At: Thu, 16 Jun 2022 12:05:36 +1000 X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Daniel Lezcano , Tomer Maimon , "Rafael J. Wysocki" , Linus Walleij , Amit Kucheria , Alexandre Torgue , Tali Perry , Paul Cercueil , Miquel Raynal , Guenter Roeck , Fabio Estevam , Lars-Peter Clausen , Benjamin Fair , Jishnu Prakash , Haibo Chen , Andy Shevchenko , Andy Gross , Olivier Moysan , Zhang Rui , Christophe Branchereau , Saravanan Sekar , Michael Hennerich , Sascha Hauer , Fabrice Gasnier , Cai Huoqing , Matthias Brugger , Gwendal Grignou , Bjorn Andersson , Benson Leung , Pengutronix Kernel Team , Lorenzo Bianconi , Avi Fishman , Patrick Venture , Nicolas Ferre , Thara Gopinath , Arnd Bergmann , Maxime Coquelin , Eugen Hristev , Shawn Guo , Claudiu Beznea , Jonathan Cameron Errors-To: openbmc-bounces+openbmc=archiver.kernel.org@lists.ozlabs.org Sender: "openbmc" Make the conversion to firmware agnostic device properties. As part of the conversion the IIO inkern interface 'of_xlate()' is also converted to 'fwnode_xlate()'. The goal is to completely drop 'of_xlate' and hence OF dependencies from IIO. Signed-off-by: Nuno Sá --- drivers/iio/adc/qcom-pm8xxx-xoadc.c | 58 ++++++++++++++--------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/drivers/iio/adc/qcom-pm8xxx-xoadc.c b/drivers/iio/adc/qcom-pm8xxx-xoadc.c index 5e9e56821075..eb424496ee1d 100644 --- a/drivers/iio/adc/qcom-pm8xxx-xoadc.c +++ b/drivers/iio/adc/qcom-pm8xxx-xoadc.c @@ -14,9 +14,9 @@ #include #include #include -#include -#include +#include #include +#include #include #include #include @@ -694,8 +694,8 @@ static int pm8xxx_read_raw(struct iio_dev *indio_dev, } } -static int pm8xxx_of_xlate(struct iio_dev *indio_dev, - const struct of_phandle_args *iiospec) +static int pm8xxx_fwnode_xlate(struct iio_dev *indio_dev, + const struct fwnode_reference_args *iiospec) { struct pm8xxx_xoadc *adc = iio_priv(indio_dev); u8 pre_scale_mux; @@ -706,10 +706,10 @@ static int pm8xxx_of_xlate(struct iio_dev *indio_dev, * First cell is prescaler or premux, second cell is analog * mux. */ - if (iiospec->args_count != 2) { - dev_err(&indio_dev->dev, "wrong number of arguments for %pOFn need 2 got %d\n", - iiospec->np, - iiospec->args_count); + if (iiospec->nargs != 2) { + dev_err(&indio_dev->dev, "wrong number of arguments for %pfwP need 2 got %d\n", + iiospec->fwnode, + iiospec->nargs); return -EINVAL; } pre_scale_mux = (u8)iiospec->args[0]; @@ -727,34 +727,34 @@ static int pm8xxx_of_xlate(struct iio_dev *indio_dev, } static const struct iio_info pm8xxx_xoadc_info = { - .of_xlate = pm8xxx_of_xlate, + .fwnode_xlate = pm8xxx_fwnode_xlate, .read_raw = pm8xxx_read_raw, }; static int pm8xxx_xoadc_parse_channel(struct device *dev, - struct device_node *np, + struct fwnode_handle *fwnode, const struct xoadc_channel *hw_channels, struct iio_chan_spec *iio_chan, struct pm8xxx_chan_info *ch) { - const char *name = np->name; + const char *name = fwnode_get_name(fwnode); const struct xoadc_channel *hwchan; - u32 pre_scale_mux, amux_channel; + u32 pre_scale_mux, amux_channel, reg[2]; u32 rsv, dec; int ret; int chid; - ret = of_property_read_u32_index(np, "reg", 0, &pre_scale_mux); + ret = fwnode_property_read_u32_array(fwnode, "reg", reg, + ARRAY_SIZE(reg)); if (ret) { - dev_err(dev, "invalid pre scale/mux number %s\n", name); - return ret; - } - ret = of_property_read_u32_index(np, "reg", 1, &amux_channel); - if (ret) { - dev_err(dev, "invalid amux channel number %s\n", name); + dev_err(dev, "invalid pre scale/mux or amux channel number %s\n", + name); return ret; } + pre_scale_mux = reg[0]; + amux_channel = reg[1]; + /* Find the right channel setting */ chid = 0; hwchan = &hw_channels[0]; @@ -778,7 +778,7 @@ static int pm8xxx_xoadc_parse_channel(struct device *dev, /* Everyone seems to use default ("type 2") decimation */ ch->decimation = VADC_DEF_DECIMATION; - if (!of_property_read_u32(np, "qcom,ratiometric", &rsv)) { + if (!fwnode_property_read_u32(fwnode, "qcom,ratiometric", &rsv)) { ch->calibration = VADC_CALIB_RATIOMETRIC; if (rsv > XOADC_RSV_MAX) { dev_err(dev, "%s too large RSV value %d\n", name, rsv); @@ -791,7 +791,7 @@ static int pm8xxx_xoadc_parse_channel(struct device *dev, } /* Optional decimation, if omitted we use the default */ - ret = of_property_read_u32(np, "qcom,decimation", &dec); + ret = fwnode_property_read_u32(fwnode, "qcom,decimation", &dec); if (!ret) { ret = qcom_vadc_decimation_from_dt(dec); if (ret < 0) { @@ -820,15 +820,14 @@ static int pm8xxx_xoadc_parse_channel(struct device *dev, return 0; } -static int pm8xxx_xoadc_parse_channels(struct pm8xxx_xoadc *adc, - struct device_node *np) +static int pm8xxx_xoadc_parse_channels(struct pm8xxx_xoadc *adc) { - struct device_node *child; + struct fwnode_handle *child; struct pm8xxx_chan_info *ch; int ret; int i; - adc->nchans = of_get_available_child_count(np); + adc->nchans = device_get_child_node_count(adc->dev); if (!adc->nchans) { dev_err(adc->dev, "no channel children\n"); return -ENODEV; @@ -846,14 +845,14 @@ static int pm8xxx_xoadc_parse_channels(struct pm8xxx_xoadc *adc, return -ENOMEM; i = 0; - for_each_available_child_of_node(np, child) { + device_for_each_child_node(adc->dev, child) { ch = &adc->chans[i]; ret = pm8xxx_xoadc_parse_channel(adc->dev, child, adc->variant->channels, &adc->iio_chans[i], ch); if (ret) { - of_node_put(child); + fwnode_handle_put(child); return ret; } i++; @@ -884,12 +883,11 @@ static int pm8xxx_xoadc_probe(struct platform_device *pdev) const struct xoadc_variant *variant; struct pm8xxx_xoadc *adc; struct iio_dev *indio_dev; - struct device_node *np = pdev->dev.of_node; struct regmap *map; struct device *dev = &pdev->dev; int ret; - variant = of_device_get_match_data(dev); + variant = device_get_match_data(dev); if (!variant) return -ENODEV; @@ -904,7 +902,7 @@ static int pm8xxx_xoadc_probe(struct platform_device *pdev) init_completion(&adc->complete); mutex_init(&adc->lock); - ret = pm8xxx_xoadc_parse_channels(adc, np); + ret = pm8xxx_xoadc_parse_channels(adc); if (ret) return ret; -- 2.36.1