Commit 7ee22731 authored by Rob Herring's avatar Rob Herring Committed by Thierry Reding
Browse files

pwm: Use device_get_match_data() 



Use preferred device_get_match_data() instead of of_match_device() to
get the driver match data. With this, adjust the includes to explicitly
include the correct headers.

As these drivers only do DT based matching, of_match_device() will never
return NULL if we've gotten to probe(). Therefore, the NULL check and
error returns can be dropped.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent b0445a18

drivers/pwm/pwm-img.c

+2 −6
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/property.h>

#include <linux/pwm.h>

#include <linux/regmap.h>

#include <linux/slab.h>
@@ -260,7 +260,6 @@ static int img_pwm_probe(struct platform_device *pdev) 
	u64 val;

	unsigned long clk_rate;

	struct img_pwm_chip *imgchip;

	const struct of_device_id *of_dev_id;



	imgchip = devm_kzalloc(&pdev->dev, sizeof(*imgchip), GFP_KERNEL);

	if (!imgchip)
@@ -272,10 +271,7 @@ static int img_pwm_probe(struct platform_device *pdev) 
	if (IS_ERR(imgchip->base))

		return PTR_ERR(imgchip->base);



	of_dev_id = of_match_device(img_pwm_of_match, &pdev->dev);

	if (!of_dev_id)

		return -ENODEV;

	imgchip->data = of_dev_id->data;

	imgchip->data = device_get_match_data(&pdev->dev);



	imgchip->periph_regs = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,

							       "img,cr-periph");

drivers/pwm/pwm-rockchip.c

+2 −7
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
#include <linux/io.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/pwm.h>

#include <linux/time.h>
@@ -296,16 +296,11 @@ MODULE_DEVICE_TABLE(of, rockchip_pwm_dt_ids); 


static int rockchip_pwm_probe(struct platform_device *pdev)

{

	const struct of_device_id *id;

	struct rockchip_pwm_chip *pc;

	u32 enable_conf, ctrl;

	bool enabled;

	int ret, count;



	id = of_match_device(rockchip_pwm_dt_ids, &pdev->dev);

	if (!id)

		return -EINVAL;



	pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);

	if (!pc)

		return -ENOMEM;
@@ -344,7 +339,7 @@ static int rockchip_pwm_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, pc);



	pc->data = id->data;

	pc->data = device_get_match_data(&pdev->dev);

	pc->chip.dev = &pdev->dev;

	pc->chip.ops = &rockchip_pwm_ops;

	pc->chip.npwm = 1;