Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / pwm / pwm-meson.c

diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index 822860b4801a6823008d51346e82d0f279c6c053..c1ed641b3e26622041c0fead2931a13bface7454 100644 (file)
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -458,7 +458,6 @@ static int meson_pwm_init_channels(struct meson_pwm *meson,
                                   struct meson_pwm_channel *channels)
 {
        struct device *dev = meson->chip.dev;
-       struct device_node *np = dev->of_node;
        struct clk_init_data init;
        unsigned int i;
        char name[255];
@@ -467,7 +466,7 @@ static int meson_pwm_init_channels(struct meson_pwm *meson,
        for (i = 0; i < meson->chip.npwm; i++) {
                struct meson_pwm_channel *channel = &channels[i];
 
-               snprintf(name, sizeof(name), "%pOF#mux%u", np, i);
+               snprintf(name, sizeof(name), "%s#mux%u", dev_name(dev), i);
 
                init.name = name;
                init.ops = &clk_mux_ops;