Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 22:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fpga: altera-ps-spi: Use spi_get_device_match_data()

Browse Source 
Use preferred spi_get_device_match_data() instead of of_match_device() and
spi_get_device_id() to get the driver match data. With this, adjust the
includes to explicitly include the correct headers.

Also drop of_match_ptr for of_ef_match, which is not necessary because DT
is always used for this driver.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20231006224624.444857-1-robh@kernel.org
[yilun.xu@intel.com: drop of_match_ptr for of_ef_match]
Signed-off-by: Xu Yilun <yilun.xu@linux.intel.com>
This commit is contained in:
Rob Herring 2023-10-06 17:46:24 -05:00 committed by Xu Yilun
parent 4e807eb05d
commit 3b08f52c25
No known key found for this signature in database
GPG Key ID: FCB70381A4A08CDA
1 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/fpga/altera-ps-spi.c
View File

@ -18,8 +18,7 @@
#include <linux/fpga/fpga-mgr.h> #include <linux/fpga/fpga-mgr.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_gpio.h> #include <linux/of.h>
#include <linux/of_device.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/sizes.h> #include <linux/sizes.h>
@ -72,12 +71,6 @@ static struct altera_ps_data a10_data = {
.t_st2ck_us = 10, /* min(t_ST2CK) */ .t_st2ck_us = 10, /* min(t_ST2CK) */
}; };
/* Array index is enum altera_ps_devtype */
static const struct altera_ps_data *altera_ps_data_map[] = {
&c5_data,
&a10_data,
};
static const struct of_device_id of_ef_match[] = { static const struct of_device_id of_ef_match[] = {
{ .compatible = "altr,fpga-passive-serial", .data = &c5_data }, { .compatible = "altr,fpga-passive-serial", .data = &c5_data },
{ .compatible = "altr,fpga-arria10-passive-serial", .data = &a10_data }, { .compatible = "altr,fpga-arria10-passive-serial", .data = &a10_data },
@ -237,43 +230,16 @@ static const struct fpga_manager_ops altera_ps_ops = {
.write_complete = altera_ps_write_complete, .write_complete = altera_ps_write_complete,
}; };
static const struct altera_ps_data *id_to_data(const struct spi_device_id *id)
{
kernel_ulong_t devtype = id->driver_data;
const struct altera_ps_data *data;
/* someone added a altera_ps_devtype without adding to the map array */
if (devtype >= ARRAY_SIZE(altera_ps_data_map))
return NULL;
data = altera_ps_data_map[devtype];
if (!data || data->devtype != devtype)
return NULL;
return data;
}
static int altera_ps_probe(struct spi_device *spi) static int altera_ps_probe(struct spi_device *spi)
{ {
struct altera_ps_conf *conf; struct altera_ps_conf *conf;
const struct of_device_id *of_id;
struct fpga_manager *mgr; struct fpga_manager *mgr;
conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL); conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
if (!conf) if (!conf)
return -ENOMEM; return -ENOMEM;
if (spi->dev.of_node) { conf->data = spi_get_device_match_data(spi);
of_id = of_match_device(of_ef_match, &spi->dev);
if (!of_id)
return -ENODEV;
conf->data = of_id->data;
} else {
conf->data = id_to_data(spi_get_device_id(spi));
if (!conf->data)
return -ENODEV;
}
conf->spi = spi; conf->spi = spi;
conf->config = devm_gpiod_get(&spi->dev, "nconfig", GPIOD_OUT_LOW); conf->config = devm_gpiod_get(&spi->dev, "nconfig", GPIOD_OUT_LOW);
if (IS_ERR(conf->config)) { if (IS_ERR(conf->config)) {
@ -308,9 +274,9 @@ static int altera_ps_probe(struct spi_device *spi)
} }
static const struct spi_device_id altera_ps_spi_ids[] = { static const struct spi_device_id altera_ps_spi_ids[] = {
{ "cyclone-ps-spi", CYCLONE5 }, { "cyclone-ps-spi", (uintptr_t)&c5_data },
{ "fpga-passive-serial", CYCLONE5 }, { "fpga-passive-serial", (uintptr_t)&c5_data },
{ "fpga-arria10-passive-serial", ARRIA10 }, { "fpga-arria10-passive-serial", (uintptr_t)&a10_data },
{} {}
}; };
MODULE_DEVICE_TABLE(spi, altera_ps_spi_ids); MODULE_DEVICE_TABLE(spi, altera_ps_spi_ids);
@ -319,7 +285,7 @@ static struct spi_driver altera_ps_driver = {
.driver = { .driver = {
.name = "altera-ps-spi", .name = "altera-ps-spi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_match_ptr(of_ef_match), .of_match_table = of_ef_match,
}, },
.id_table = altera_ps_spi_ids, .id_table = altera_ps_spi_ids,
.probe = altera_ps_probe, .probe = altera_ps_probe,