From patchwork Wed Mar 27 19:29:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13607352 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 D67BEC54E67 for ; Wed, 27 Mar 2024 19:33:12 +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=Q6T8LLykyKtd5YOSu6pZ2SEw8M/6fN1f0su4QeQu5IY=; b=o4H4iNRR1hWm9v tCsRvbQtgAnylg1dZ25uLu9snYgx75Tew8/6cG3RRfHaqx9H+9FaUt86J5GV0kP8ninI6wDYAM/Vl qKvEHBJbfbw5qU5Y0jooTGwohBb3TYqUR2augWv2KIINUyxGPS3WBs/9QNNB6MHds3Q66i3i6PCPB cY/ke3tqrrcbjiCWGHbdoUcrf1qgcXBQsDDargE6Dx2qs6p4YO+VlklDwIPR15EjhHmMdM7xWXYpa vt3Z1M3bGpemkEDSxrs65DMz9el+gQ6p/pf4ESyCp2hLcSvt094QZGyf0B9Oij2M8biEAmf0uZoqI 0UzusPe98im5SkRJFfkw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpZ1B-0000000AoNk-3Yq6; Wed, 27 Mar 2024 19:33:01 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpZ0B-0000000Anx1-3LOl for linux-arm-kernel@bombadil.infradead.org; Wed, 27 Mar 2024 19:31:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=8EPDIc/QHS4XXGtiAfNHjPzn4OzvA+ixVgjZ9o3y0A8=; b=Iz/2+cMAC5CJaqHdCvVwVtW8mk byEoHER8GgBnbnjktfdW2l3OGxgLZJtYRDDG3Bt66YFAscQu5wd/dRkrOnIGyY9Ua+ztGQg6RtMxk gksIlM9SffTRpvRA8Ymnv3ZfpKFrU5CEx9O0pEH5fmu5qFKkRDPOnNBg5YCXDyUOF71I2up3WLrNg mT5flqpT9sziFASguNv+QSMwubjZ6nlBW9KIBvsxJNVOmViAIIffV8Elw0nEvG+4914Kak9tr6ljn g/leOhprp4sikuG5DVuRbHGwGT5f748XxKzP6iVOfFgWZUf5jC7hGIleHSLUt3Xn+wtgIV424kmTV UxRLP+tg==; Received: from mgamail.intel.com ([192.198.163.8]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpZ08-00000000VvU-1Mt4 for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2024 19:31:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711567915; x=1743103915; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kgE+EkgRK0Q0USsISvasAwmIHSRztSfu+eyxHqW1wf8=; b=kkPfgXyabTzh/fls3Nzmguk1lIYWtSkTAi8eljgntlVumPbCho+O5+ie +wY2Ck+/eyoIokgjXIVoyI+7xmsDa0/c69mtKQMWlmoojqYrbKJ4I31K2 vXbard91XB15xQNb9sPqTAKOEQscrLZjzh5khETbFK3r60Avc0e5Kk4Us rhvK5+WAnwbU4f/9cV2JD+FYxoc186r61Tw99zs2rvJSIs3sH/BIvRWt5 1NN0A9Nssbs1SbfmZ9YlLPfm/Taz2AhOAzYoTrYQGhlrbgUDgByx77g2Y 1Mb7ssp7liqzSgmc4IOtzNwsuGw2XriLxj9d7OVaiM/MyTeIwTrONPwpN A==; X-CSE-ConnectionGUID: wtnb6q5ISDeON42OyaQVqw== X-CSE-MsgGUID: lKekpQRHQsGJqI3VZdjZ3g== X-IronPort-AV: E=McAfee;i="6600,9927,11026"; a="24187299" X-IronPort-AV: E=Sophos;i="6.07,159,1708416000"; d="scan'208";a="24187299" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2024 12:31:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11026"; a="937075026" X-IronPort-AV: E=Sophos;i="6.07,159,1708416000"; d="scan'208";a="937075026" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 27 Mar 2024 12:31:43 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 982124F6; Wed, 27 Mar 2024 21:31:42 +0200 (EET) From: Andy Shevchenko To: Mark Brown , Andy Shevchenko , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King Subject: [PATCH v2 2/9] spi: pxa2xx: Drop ACPI_PTR() and of_match_ptr() Date: Wed, 27 Mar 2024 21:29:21 +0200 Message-ID: <20240327193138.2385910-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240327193138.2385910-1-andriy.shevchenko@linux.intel.com> References: <20240327193138.2385910-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240327_193156_890462_88BE2BA8 X-CRM114-Status: GOOD ( 15.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Drop rather useless use of ACPI_PTR() and of_match_ptr(). It also removes the necessity to be dependent of.h inclusion. Signed-off-by: Andy Shevchenko --- drivers/spi/spi-pxa2xx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 1d43346b4436..75d208087748 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -1725,7 +1724,6 @@ static const struct dev_pm_ops pxa2xx_spi_pm_ops = { RUNTIME_PM_OPS(pxa2xx_spi_runtime_suspend, pxa2xx_spi_runtime_resume, NULL) }; -#ifdef CONFIG_ACPI static const struct acpi_device_id pxa2xx_spi_acpi_match[] = { { "80860F0E", LPSS_BYT_SSP }, { "8086228E", LPSS_BSW_SSP }, @@ -1736,9 +1734,8 @@ static const struct acpi_device_id pxa2xx_spi_acpi_match[] = { {} }; MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match); -#endif -static const struct of_device_id pxa2xx_spi_of_match[] __maybe_unused = { +static const struct of_device_id pxa2xx_spi_of_match[] = { { .compatible = "marvell,mmp2-ssp", .data = (void *)MMP2_SSP }, {} }; @@ -1748,8 +1745,8 @@ static struct platform_driver driver = { .driver = { .name = "pxa2xx-spi", .pm = pm_ptr(&pxa2xx_spi_pm_ops), - .acpi_match_table = ACPI_PTR(pxa2xx_spi_acpi_match), - .of_match_table = of_match_ptr(pxa2xx_spi_of_match), + .acpi_match_table = pxa2xx_spi_acpi_match, + .of_match_table = pxa2xx_spi_of_match, }, .probe = pxa2xx_spi_probe, .remove_new = pxa2xx_spi_remove,