Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[karo-tx-linux.git] / include / linux / pwm.h

diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index cfc3ed46cad20a26ffa131b51e25927ac6045f4c..10ca94eeb59d1e8dd7cd5eaefa9500e98c165794 100644 (file)
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -184,18 +184,17 @@ struct pwm_ops {
  *             operations may sleep
  */
 struct pwm_chip {
-       struct device *dev;
-       struct list_head list;
-       const struct pwm_ops *ops;
-       int base;
-       unsigned int npwm;
+       struct device           *dev;
+       struct list_head        list;
+       const struct pwm_ops    *ops;
+       int                     base;
+       unsigned int            npwm;
 
-       struct pwm_device *pwms;
+       struct pwm_device       *pwms;
 
-       struct pwm_device * (*of_xlate)(struct pwm_chip *pc,
-                                       const struct of_phandle_args *args);
-       unsigned int of_pwm_n_cells;
-       bool can_sleep;
+       struct pwm_device *     (*of_xlate)(struct pwm_chip *pc,
+                                           const struct of_phandle_args *args);
+       bool                    can_sleep;
 };
 
 #if IS_ENABLED(CONFIG_PWM)