|
@@ -1211,15 +1211,13 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
|
|
|
struct resource *r;
|
|
|
struct spi_master *master;
|
|
|
const struct sh_msiof_chipdata *chipdata;
|
|
|
- const struct of_device_id *of_id;
|
|
|
struct sh_msiof_spi_info *info;
|
|
|
struct sh_msiof_spi_priv *p;
|
|
|
int i;
|
|
|
int ret;
|
|
|
|
|
|
- of_id = of_match_device(sh_msiof_match, &pdev->dev);
|
|
|
- if (of_id) {
|
|
|
- chipdata = of_id->data;
|
|
|
+ chipdata = of_device_get_match_data(&pdev->dev);
|
|
|
+ if (chipdata) {
|
|
|
info = sh_msiof_spi_parse_dt(&pdev->dev);
|
|
|
} else {
|
|
|
chipdata = (const void *)pdev->id_entry->driver_data;
|