Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / pwm / pwm-samsung.c

diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c
index 515489f..dd94c43 100644 (file)
--- a/drivers/pwm/pwm-samsung.c
+++ b/drivers/pwm/pwm-samsung.c
@@ -526,9 +526,6 @@ static int pwm_samsung_probe(struct platform_device *pdev)
                ret = pwm_samsung_parse_dt(chip);
                if (ret)
                        return ret;
-
-               chip->chip.of_xlate = of_pwm_xlate_with_flags;
-               chip->chip.of_pwm_n_cells = 3;
        } else {
                if (!pdev->dev.platform_data) {
                        dev_err(&pdev->dev, "no platform data specified\n");
@@ -583,11 +580,8 @@ static int pwm_samsung_probe(struct platform_device *pdev)
 static int pwm_samsung_remove(struct platform_device *pdev)
 {
        struct samsung_pwm_chip *chip = platform_get_drvdata(pdev);
-       int ret;
 
-       ret = pwmchip_remove(&chip->chip);
-       if (ret < 0)
-               return ret;
+       pwmchip_remove(&chip->chip);
 
        clk_disable_unprepare(chip->base_clk);