spi: rspi: Use of_device_get_match_data() helper (219a7bc5) · Commits · 戴 / test

drivers/spi/spi-rspi.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1221,7 +1221,6 @@ static int rspi_probe(struct platform_device *pdev)
	struct spi_master *master;		struct spi_master *master;
	struct rspi_data *rspi;		struct rspi_data *rspi;
	int ret;		int ret;
	const struct of_device_id *of_id;
	const struct rspi_plat_data *rspi_pd;		const struct rspi_plat_data *rspi_pd;
	const struct spi_ops *ops;		const struct spi_ops *ops;

	@@ -1229,9 +1228,8 @@ static int rspi_probe(struct platform_device *pdev)
	if (master == NULL)		if (master == NULL)
	return -ENOMEM;		return -ENOMEM;

	of_id = of_match_device(rspi_of_match, &pdev->dev);		ops = of_device_get_match_data(&pdev->dev);
	if (of_id) {		if (ops) {
	ops = of_id->data;
	ret = rspi_parse_dt(&pdev->dev, master);		ret = rspi_parse_dt(&pdev->dev, master);
	if (ret)		if (ret)
	goto error1;		goto error1;