Hi Joel, On 2022/2/14 下午 02:34, Joel Stanley wrote:
On Mon, 14 Feb 2022 at 03:27, Jammy Huang <jammy_huang@xxxxxxxxxxxxxx> wrote:Use of_device_get_match_data() to simplify the code. Signed-off-by: Jammy Huang <jammy_huang@xxxxxxxxxxxxxx> --- drivers/media/platform/aspeed-video.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 3904ded2052a..d4acf84cda9b 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/of_reserved_mem.h> #include <linux/platform_device.h> @@ -2451,7 +2452,6 @@ MODULE_DEVICE_TABLE(of, aspeed_video_of_match); static int aspeed_video_probe(struct platform_device *pdev) { const struct aspeed_video_config *config; - const struct of_device_id *match; struct aspeed_video *video; int rc; @@ -2463,11 +2463,7 @@ static int aspeed_video_probe(struct platform_device *pdev) if (IS_ERR(video->base)) return PTR_ERR(video->base); - match = of_match_node(aspeed_video_of_match, pdev->dev.of_node); - if (!match) - return -EINVAL; - - config = match->data; + config = of_device_get_match_data(&pdev->dev);While normally this driver won't have probed without matching on some data, it would be sensible to add a check for a null pointer here.
OK, I will have a updated patch for this later. Thanks for the help.
video->version = config->version; video->jpeg_mode = config->jpeg_mode; video->comp_size_read = config->comp_size_read; -- 2.25.1
-- Best Regards Jammy
