Unverified Commit 0e1f0b1c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: pxa2xx: Move OF and ACPI ID tables closer to their user 



There is no code that uses ID tables directly, except the
struct device_driver at the end of the file. Hence, move
tables closer to its user. It's always possible to access
them via pointer to a platform device.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20221021190018.63646-5-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 07c33792

drivers/spi/spi-pxa2xx.c

+19 −19
Original line number Diff line number Diff line
@@ -1321,25 +1321,6 @@ static void cleanup(struct spi_device *spi) 
	kfree(chip);

}



#ifdef CONFIG_ACPI

static const struct acpi_device_id pxa2xx_spi_acpi_match[] = {

	{ "INT33C0", LPSS_LPT_SSP },

	{ "INT33C1", LPSS_LPT_SSP },

	{ "INT3430", LPSS_LPT_SSP },

	{ "INT3431", LPSS_LPT_SSP },

	{ "80860F0E", LPSS_BYT_SSP },

	{ "8086228E", LPSS_BSW_SSP },

	{ },

};

MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match);

#endif



static const struct of_device_id pxa2xx_spi_of_match[] = {

	{ .compatible = "marvell,mmp2-ssp", .data = (void *)MMP2_SSP },

	{},

};

MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match);



static bool pxa2xx_spi_idma_filter(struct dma_chan *chan, void *param)

{

	return param == chan->device->dev;
@@ -1762,6 +1743,25 @@ 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 },

	{ "INT33C0", LPSS_LPT_SSP },

	{ "INT33C1", LPSS_LPT_SSP },

	{ "INT3430", LPSS_LPT_SSP },

	{ "INT3431", LPSS_LPT_SSP },

	{}

};

MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match);

#endif



static const struct of_device_id pxa2xx_spi_of_match[] = {

	{ .compatible = "marvell,mmp2-ssp", .data = (void *)MMP2_SSP },

	{}

};

MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match);



static struct platform_driver driver = {

	.driver = {

		.name	= "pxa2xx-spi",