From patchwork Wed May 4 11:35:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12837707 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9A25C433EF for ; Wed, 4 May 2022 11:36:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348452AbiEDLjk (ORCPT ); Wed, 4 May 2022 07:39:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348906AbiEDLjj (ORCPT ); Wed, 4 May 2022 07:39:39 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EEBA2B25F; Wed, 4 May 2022 04:36:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651664163; x=1683200163; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=7C3kW2JgC07k1KkETjGbC4cqsYvXG7ExF22Q6uzU8/8=; b=hfcRgGaX7yB1tzrXLJUVtschoxAvk352KvkEMsZfudEJaReDjYveIYr+ MUllQps/aHsc/wH9yj7MQunXqm0VplTioOI3JaocK2Zl3rN7a1elF6Wx7 lSzl0PNY5jJdJbRuu5y+S03h94Oz5nZqOpobYjZ28CwavxpPsrjVuyE/H ZkOvb1bdc+sNS1nlUYMNhEc/aAM62Uu9eJaIstdAOlllD14zMIzAg4sg0 zZrAsIJsvx/V5VFBfS7OKhSrWlSsReRHDQtWrts5rf7dHgL8jaB29sp5W kKp6DBA1lQHOWiyg80KtOOybovjrRkDrZ5SMHFX2ORj+jQHmnuAqC/TB/ A==; X-IronPort-AV: E=McAfee;i="6400,9594,10336"; a="267620629" X-IronPort-AV: E=Sophos;i="5.91,197,1647327600"; d="scan'208";a="267620629" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2022 04:36:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,197,1647327600"; d="scan'208";a="516988540" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 04 May 2022 04:36:00 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id F132A2E4; Wed, 4 May 2022 14:36:01 +0300 (EEST) From: Andy Shevchenko To: Jonathan Cameron , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andreas Klinger , Jonathan Cameron , Lars-Peter Clausen , Andy Shevchenko Subject: [PATCH v1 1/1] iio: proximity: srf04: Make use of device properties Date: Wed, 4 May 2022 14:35:57 +0300 Message-Id: <20220504113557.59048-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Convert the module to be property provider agnostic and allow it to be used on non-OF platforms. Signed-off-by: Andy Shevchenko --- drivers/iio/proximity/srf04.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/iio/proximity/srf04.c b/drivers/iio/proximity/srf04.c index 4e6286765f01..05015351a34a 100644 --- a/drivers/iio/proximity/srf04.c +++ b/drivers/iio/proximity/srf04.c @@ -37,9 +37,8 @@ #include #include #include +#include #include -#include -#include #include #include #include @@ -261,7 +260,7 @@ static int srf04_probe(struct platform_device *pdev) data = iio_priv(indio_dev); data->dev = dev; - data->cfg = of_match_device(of_srf04_match, dev)->data; + data->cfg = device_get_match_data(dev); mutex_init(&data->lock); init_completion(&data->rising); @@ -289,10 +288,8 @@ static int srf04_probe(struct platform_device *pdev) return PTR_ERR(data->gpiod_power); } if (data->gpiod_power) { - - if (of_property_read_u32(dev->of_node, "startup-time-ms", - &data->startup_time_ms)) - data->startup_time_ms = 100; + data->startup_time_ms = 100; + device_property_read_u32(dev, "startup-time-ms", &data->startup_time_ms); dev_dbg(dev, "using power gpio: startup-time-ms=%d\n", data->startup_time_ms); }