On 3/31/21 7:25 PM, Tian Tao wrote:
> Use the device_get_match_data() helper instead of open coding.
>
> Signed-off-by: Tian Tao <tiantao6@xxxxxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/meson_wdt.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
> index 459f3ae..539feaa 100644
> --- a/drivers/watchdog/meson_wdt.c
> +++ b/drivers/watchdog/meson_wdt.c
> @@ -162,7 +162,6 @@ static int meson_wdt_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct meson_wdt_dev *meson_wdt;
> - const struct of_device_id *of_id;
> int err;
>
> meson_wdt = devm_kzalloc(dev, sizeof(*meson_wdt), GFP_KERNEL);
> @@ -173,12 +172,7 @@ static int meson_wdt_probe(struct platform_device *pdev)
> if (IS_ERR(meson_wdt->wdt_base))
> return PTR_ERR(meson_wdt->wdt_base);
>
> - of_id = of_match_device(meson_wdt_dt_ids, dev);
> - if (!of_id) {
> - dev_err(dev, "Unable to initialize WDT data\n");
> - return -ENODEV;
> - }
> - meson_wdt->data = of_id->data;
> + meson_wdt->data = device_get_match_data(dev);
>
> meson_wdt->wdt_dev.parent = dev;
> meson_wdt->wdt_dev.info = &meson_wdt_info;
>
