Commit e6c7c258 authored by Sam Shih's avatar Sam Shih Committed by Thierry Reding
Browse files

pwm: mediatek: Drop the check for of_device_get_match_data() 



This patch drop the check for of_device_get_match_data. Due to the only
way call driver probe is compatible match. The data pointer which points
to the SoC specify data is directly set by driver, and it should not be
NULL in our case. We can safety remove the check for the result of
of_device_get_match_data().

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarSam Shih <sam.shih@mediatek.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 9193c16e

drivers/pwm/pwm-mediatek.c

+3 −7
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ static const struct pwm_ops mtk_pwm_ops = { 


static int mtk_pwm_probe(struct platform_device *pdev)

{

	const struct mtk_pwm_platform_data *data;

	struct mtk_pwm_chip *pc;

	struct resource *res;

	unsigned int i;
@@ -236,17 +235,14 @@ static int mtk_pwm_probe(struct platform_device *pdev) 
	if (!pc)

		return -ENOMEM;



	data = of_device_get_match_data(&pdev->dev);

	if (data == NULL)

		return -EINVAL;

	pc->soc = data;

	pc->soc = of_device_get_match_data(&pdev->dev);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pc->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(pc->regs))

		return PTR_ERR(pc->regs);



	for (i = 0; i < data->num_pwms + 2 && pc->soc->has_clks; i++) {

	for (i = 0; i < pc->soc->num_pwms + 2 && pc->soc->has_clks; i++) {

		pc->clks[i] = devm_clk_get(&pdev->dev, mtk_pwm_clk_name[i]);

		if (IS_ERR(pc->clks[i])) {

			dev_err(&pdev->dev, "clock: %s fail: %ld\n",
@@ -260,7 +256,7 @@ static int mtk_pwm_probe(struct platform_device *pdev) 
	pc->chip.dev = &pdev->dev;

	pc->chip.ops = &mtk_pwm_ops;

	pc->chip.base = -1;

	pc->chip.npwm = data->num_pwms;

	pc->chip.npwm = pc->soc->num_pwms;



	ret = pwmchip_add(&pc->chip);

	if (ret < 0) {