From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Mark Brown <broonie@kernel.org>, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Daniel Mack <daniel@zonque.org>, Haojian Zhuang <haojian.zhuang@gmail.com>, Robert Jarzmik <robert.jarzmik@free.fr>, Russell King <linux@armlinux.org.uk> Subject: [PATCH v1 01/10] spi: pxa2xx: Drop ACPI_PTR() and of_match_ptr() Date: Tue, 26 Mar 2024 20:07:51 +0200 [thread overview] Message-ID: <20240326181027.1418989-2-andriy.shevchenko@linux.intel.com> (raw) In-Reply-To: <20240326181027.1418989-1-andriy.shevchenko@linux.intel.com> Drop rather useless use of ACPI_PTR() and of_match_ptr(). It also removes the necessity to be dependent on ACPI and of.h inclusion. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/spi/Kconfig | 2 +- drivers/spi/spi-pxa2xx.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index bc7021da2fe9..7cf86b034083 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -817,7 +817,7 @@ config SPI_PPC4xx config SPI_PXA2XX tristate "PXA2xx SSP SPI master" - depends on ARCH_PXA || ARCH_MMP || PCI || ACPI || COMPILE_TEST + depends on ARCH_PXA || ARCH_MMP || PCI || COMPILE_TEST select PXA_SSP if ARCH_PXA || ARCH_MMP help This enables using a PXA2xx or Sodaville SSP port as a SPI master diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 6c2a14418972..2c39d3ff498e 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -19,7 +19,6 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/mod_devicetable.h> -#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/property.h> @@ -1730,7 +1729,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 }, @@ -1741,9 +1739,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 }, {} }; @@ -1753,8 +1750,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, -- 2.43.0.rc1.1.gbec44491f096
WARNING: multiple messages have this Message-ID (diff)
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Mark Brown <broonie@kernel.org>, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Daniel Mack <daniel@zonque.org>, Haojian Zhuang <haojian.zhuang@gmail.com>, Robert Jarzmik <robert.jarzmik@free.fr>, Russell King <linux@armlinux.org.uk> Subject: [PATCH v1 01/10] spi: pxa2xx: Drop ACPI_PTR() and of_match_ptr() Date: Tue, 26 Mar 2024 20:07:51 +0200 [thread overview] Message-ID: <20240326181027.1418989-2-andriy.shevchenko@linux.intel.com> (raw) In-Reply-To: <20240326181027.1418989-1-andriy.shevchenko@linux.intel.com> Drop rather useless use of ACPI_PTR() and of_match_ptr(). It also removes the necessity to be dependent on ACPI and of.h inclusion. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/spi/Kconfig | 2 +- drivers/spi/spi-pxa2xx.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index bc7021da2fe9..7cf86b034083 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -817,7 +817,7 @@ config SPI_PPC4xx config SPI_PXA2XX tristate "PXA2xx SSP SPI master" - depends on ARCH_PXA || ARCH_MMP || PCI || ACPI || COMPILE_TEST + depends on ARCH_PXA || ARCH_MMP || PCI || COMPILE_TEST select PXA_SSP if ARCH_PXA || ARCH_MMP help This enables using a PXA2xx or Sodaville SSP port as a SPI master diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 6c2a14418972..2c39d3ff498e 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -19,7 +19,6 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/mod_devicetable.h> -#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/property.h> @@ -1730,7 +1729,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 }, @@ -1741,9 +1739,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 }, {} }; @@ -1753,8 +1750,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, -- 2.43.0.rc1.1.gbec44491f096 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-03-26 18:10 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-26 18:07 [PATCH v1 00/10] spi: pxa2xx: Drop linux/spi/pxa2xx_spi.h Andy Shevchenko 2024-03-26 18:07 ` Andy Shevchenko 2024-03-26 18:07 ` Andy Shevchenko [this message] 2024-03-26 18:07 ` [PATCH v1 01/10] spi: pxa2xx: Drop ACPI_PTR() and of_match_ptr() Andy Shevchenko 2024-03-26 18:16 ` Mark Brown 2024-03-26 18:16 ` Mark Brown 2024-03-26 18:22 ` Andy Shevchenko 2024-03-26 18:22 ` Andy Shevchenko 2024-03-26 18:25 ` Mark Brown 2024-03-26 18:25 ` Mark Brown 2024-03-26 18:44 ` Andy Shevchenko 2024-03-26 18:44 ` Andy Shevchenko 2024-03-26 18:49 ` Mark Brown 2024-03-26 18:49 ` Mark Brown 2024-03-26 18:52 ` Andy Shevchenko 2024-03-26 18:52 ` Andy Shevchenko 2024-03-26 19:10 ` Mark Brown 2024-03-26 19:10 ` Mark Brown 2024-03-26 19:20 ` Andy Shevchenko 2024-03-26 19:20 ` Andy Shevchenko 2024-03-26 19:21 ` Andy Shevchenko 2024-03-26 19:21 ` Andy Shevchenko 2024-03-26 19:32 ` Mark Brown 2024-03-26 19:32 ` Mark Brown 2024-03-26 20:04 ` Andy Shevchenko 2024-03-26 20:04 ` Andy Shevchenko 2024-03-26 20:12 ` Mark Brown 2024-03-26 20:12 ` Mark Brown 2024-03-26 20:17 ` Andy Shevchenko 2024-03-26 20:17 ` Andy Shevchenko 2024-03-26 18:07 ` [PATCH v1 02/10] spi: pxa2xx: Keep PXA*_SSP types together Andy Shevchenko 2024-03-26 18:07 ` Andy Shevchenko 2024-03-26 18:07 ` [PATCH v1 03/10] spi: pxa2xx: Switch to use dev_err_probe() Andy Shevchenko 2024-03-26 18:07 ` Andy Shevchenko 2024-03-26 18:07 ` [PATCH v1 04/10] spi: pxa2xx: Extract pxa2xx_spi_init_ssp() helper Andy Shevchenko 2024-03-26 18:07 ` Andy Shevchenko 2024-03-26 18:07 ` [PATCH v1 05/10] spi: pxa2xx: Skip SSP initialization if it's done elsewhere Andy Shevchenko 2024-03-26 18:07 ` Andy Shevchenko 2024-03-26 18:07 ` [PATCH v1 06/10] spi: pxa2xx: Allow number of chip select pins to be read from property Andy Shevchenko 2024-03-26 18:07 ` Andy Shevchenko 2024-03-26 18:07 ` [PATCH v1 07/10] spi: pxa2xx: Provide num-cs for Sharp PDAs via device properties Andy Shevchenko 2024-03-26 18:07 ` Andy Shevchenko 2024-03-26 18:21 ` Mark Brown 2024-03-26 18:21 ` Mark Brown 2024-03-26 18:50 ` Andy Shevchenko 2024-03-26 18:50 ` Andy Shevchenko 2024-03-26 20:02 ` Mark Brown 2024-03-26 20:02 ` Mark Brown 2024-03-26 20:12 ` Andy Shevchenko 2024-03-26 20:12 ` Andy Shevchenko 2024-03-26 20:26 ` Mark Brown 2024-03-26 20:26 ` Mark Brown 2024-03-26 21:20 ` Andy Shevchenko 2024-03-26 21:20 ` Andy Shevchenko 2024-03-26 18:07 ` [PATCH v1 08/10] spi: pxa2xx: Move contents of linux/spi/pxa2xx_spi.h to a local one Andy Shevchenko 2024-03-26 18:07 ` Andy Shevchenko 2024-03-26 18:07 ` [PATCH v1 09/10] spi: pxa2xx: Remove outdated documentation Andy Shevchenko 2024-03-26 18:07 ` Andy Shevchenko 2024-03-26 18:08 ` [PATCH v1 10/10] spi: pxa2xx: Don't use "proxy" headers Andy Shevchenko 2024-03-26 18:08 ` Andy Shevchenko 2024-03-26 20:55 ` (subset) [PATCH v1 00/10] spi: pxa2xx: Drop linux/spi/pxa2xx_spi.h Mark Brown 2024-03-26 20:55 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240326181027.1418989-2-andriy.shevchenko@linux.intel.com \ --to=andriy.shevchenko@linux.intel.com \ --cc=broonie@kernel.org \ --cc=daniel@zonque.org \ --cc=haojian.zhuang@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=robert.jarzmik@free.fr \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.