From patchwork Tue Jan 10 14:08:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 41491 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2767448wrt; Tue, 10 Jan 2023 06:10:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXuv30hctWLzMQUULhgjR7E98qSCdPaRoIJt1c5NWUIfsKQtjbx5zfp+wnGPxbOVegrYcbOs X-Received: by 2002:a17:906:abc6:b0:7ad:d835:e822 with SMTP id kq6-20020a170906abc600b007add835e822mr61899096ejb.42.1673359844254; Tue, 10 Jan 2023 06:10:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673359844; cv=none; d=google.com; s=arc-20160816; b=DNuVZybFzUeXCd++7zGDw+f/YxNa60S5gUj3P0S8KfNEM0NRWwDSMMuMgQ88v1rvZZ mvUDb3vWRDGtGI3UMu83R8MQGJCrt9JDdKJ/gg1Q1iR9EZAtddL30z4HEUUvqgPi2D3V lVxycbaR11NAax5amxUnT4rB8PMHHjesgXM/ZEh8H/dED3pg/ZDtBrCSZtavMSMxEv4K MI8T4Ux3rnPj6nWcjz5N2/QS2Mhk1xZRsaEYGHE8UwJFPiwnt9b02dXUtDbw1Knh4BHR 13+ASvpntdEUwObp1VbhTnfrV236RxRKGpztNWu/Td1ul6ouI6dE6ms56QOkwtSFdwoo Ewdg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PzOGsUSE5nx0USVwzLxfBguJdcAlROsRCowhvYiZyXQ=; b=M58xKnyBdJ4QYNad+RIszMMUFFf6t3n9jqw2S7eRa8Mr6ys94N4zSKvP3auYYaqZI4 l/HD2ndjgnAyVDubipMSUf0MbNNNNyhJiklbKf0ZcDBTN1BVNzbM5kDqPvvQxLpdplg4 racovjB6AXyFnpX0fe2S6Lq7A4XFebW+RYrEo/FQQ4Rlhvjcccf02r/ILsU4lUrR/lHI 1wot7VSQIloe/Psw/0iNnqrlL/GFM0ZZVbvGwghnS+wEciH1CxFL41nBm5Q2w+x8ZQSa 0MUC40E8mARA068n8sYglIX82S5dAtAC/UR+FbfvscpmO68P2/4+2oPCaHlfQ9Gb9brW SXSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NbDDbR8i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id eo6-20020a056402530600b00482efc40d58si11430067edb.400.2023.01.10.06.10.09; Tue, 10 Jan 2023 06:10:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NbDDbR8i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232356AbjAJOH7 (ORCPT + 99 others); Tue, 10 Jan 2023 09:07:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238655AbjAJOHm (ORCPT ); Tue, 10 Jan 2023 09:07:42 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 291163FC83; Tue, 10 Jan 2023 06:07:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673359662; x=1704895662; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4eiyGTWXX+oD7HoJjkMNpYlz3/ZKnnaK5/dHNcnJkPA=; b=NbDDbR8iE534INn82Hz0vTgz0DWeEBxa9uJcVtPOpHXUhP9NeD3NE3qZ nXH3qnYx9oJL9Pw6MeAiZ2DiOs+SVJAmykHtXnVHgfcvrblN4a5B10Ggw c6NVhLbf2BAsKlPdXkTouiknofwOdelf7ZJf8L4LKQbdzS2O18E1DcBtf SQI8K5hoHM68gDqAKX4VU2umq/EK6tKSy27qogRlRPBD77CkTCjbaFOKZ M+wcDSZEXPJCOkMNyopqcx7gLM3kEVXVJWgVavgX2L+s+s90n1i2MKrmu nTmAENI8cMPFcHAIB0khak3v4UsmeriOGufEXrjP3fHFy9MfajuIlm8AB Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="325156487" X-IronPort-AV: E=Sophos;i="5.96,315,1665471600"; d="scan'208";a="325156487" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2023 06:07:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="606971782" X-IronPort-AV: E=Sophos;i="5.96,315,1665471600"; d="scan'208";a="606971782" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 10 Jan 2023 06:07:39 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 048AA31D; Tue, 10 Jan 2023 16:08:13 +0200 (EET) From: Andy Shevchenko To: Rasmus Villemoes , linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org Cc: Alessandro Zummo , Alexandre Belloni , Jean Delvare , Guenter Roeck , Andy Shevchenko Subject: [PATCH v2 3/5] rtc: isl12022: Drop unneeded OF guards and of_match_ptr() Date: Tue, 10 Jan 2023 16:08:04 +0200 Message-Id: <20230110140806.87432-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110140806.87432-1-andriy.shevchenko@linux.intel.com> References: <20230110140806.87432-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754644972140882086?= X-GMAIL-MSGID: =?utf-8?q?1754644972140882086?= Drop unneeded OF guards and of_match_ptr(). This allows use of the driver with other types of firmware such as ACPI PRP0001 based probing. Signed-off-by: Andy Shevchenko --- drivers/rtc/rtc-isl12022.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c index bf1aa6f6560d..77b4763f2a70 100644 --- a/drivers/rtc/rtc-isl12022.c +++ b/drivers/rtc/rtc-isl12022.c @@ -14,8 +14,6 @@ #include #include #include -#include -#include #include #include @@ -46,8 +44,6 @@ #define ISL12022_BETA_TSE (1 << 7) -static struct i2c_driver isl12022_driver; - static umode_t isl12022_hwmon_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr, int channel) @@ -252,14 +248,12 @@ static int isl12022_probe(struct i2c_client *client) return devm_rtc_register_device(rtc); } -#ifdef CONFIG_OF static const struct of_device_id isl12022_dt_match[] = { { .compatible = "isl,isl12022" }, /* for backward compat., don't use */ { .compatible = "isil,isl12022" }, { }, }; MODULE_DEVICE_TABLE(of, isl12022_dt_match); -#endif static const struct i2c_device_id isl12022_id[] = { { "isl12022", 0 }, @@ -270,9 +264,7 @@ MODULE_DEVICE_TABLE(i2c, isl12022_id); static struct i2c_driver isl12022_driver = { .driver = { .name = "rtc-isl12022", -#ifdef CONFIG_OF - .of_match_table = of_match_ptr(isl12022_dt_match), -#endif + .of_match_table = isl12022_dt_match, }, .probe_new = isl12022_probe, .id_table = isl12022_id,