| Message ID | 1601449988-41463-3-git-send-email-tiantao6@hisilicon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Use the same style of variable type | expand |
Hi On Wed, 30 Sep 2020 15:13:08 +0800 Tian Tao <tiantao6@hisilicon.com> wrote: > Consistently Use the same style of variable type in hibmc_drm_de.c and > hibmc_drm_de.h. > > Signed-off-by: Tian Tao <tiantao6@hisilicon.com> > --- > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 13 ++++++------- > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 8 ++++---- > 2 files changed, 10 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c index 5632bce..0c1b40d > 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > @@ -121,12 +121,11 @@ static void hibmc_kms_fini(struct hibmc_drm_private > *priv) /* > * It can operate in one of three modes: 0, 1 or Sleep. > */ > -void hibmc_set_power_mode(struct hibmc_drm_private *priv, > - unsigned int power_mode) > +void hibmc_set_power_mode(struct hibmc_drm_private *priv, u32 power_mode) > { > - unsigned int control_value = 0; > + u32 control_value = 0; > void __iomem *mmio = priv->mmio; > - unsigned int input = 1; > + u32 input = 1; > > if (power_mode > HIBMC_PW_MODE_CTL_MODE_SLEEP) > return; > @@ -144,8 +143,8 @@ void hibmc_set_power_mode(struct hibmc_drm_private > *priv, > void hibmc_set_current_gate(struct hibmc_drm_private *priv, unsigned int > gate) { > - unsigned int gate_reg; > - unsigned int mode; > + u32 gate_reg; > + u32 mode; > void __iomem *mmio = priv->mmio; > > /* Get current power mode. */ > @@ -170,7 +169,7 @@ void hibmc_set_current_gate(struct hibmc_drm_private > *priv, unsigned int gate) > static void hibmc_hw_config(struct hibmc_drm_private *priv) > { > - unsigned int reg; > + u32 reg; > > /* On hardware reset, power mode 0 is default. */ > hibmc_set_power_mode(priv, HIBMC_PW_MODE_CTL_MODE_MODE0); > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h index 6a63502..5c4030d > 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > @@ -33,8 +33,8 @@ struct hibmc_drm_private { > /* hw */ > void __iomem *mmio; > void __iomem *fb_map; > - unsigned long fb_base; > - unsigned long fb_size; > + u64 fb_base; > + u64 fb_size; resource_size_t would be the correct type here. With my comments addressed: Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Best regards Thomas > > /* drm */ > struct drm_device *dev; > @@ -56,9 +56,9 @@ static inline struct hibmc_drm_private > *to_hibmc_drm_private(struct drm_device * } > > void hibmc_set_power_mode(struct hibmc_drm_private *priv, > - unsigned int power_mode); > + u32 power_mode); > void hibmc_set_current_gate(struct hibmc_drm_private *priv, > - unsigned int gate); > + u32 gate); > > int hibmc_de_init(struct hibmc_drm_private *priv); > int hibmc_vdac_init(struct hibmc_drm_private *priv);
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c index 5632bce..0c1b40d 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c @@ -121,12 +121,11 @@ static void hibmc_kms_fini(struct hibmc_drm_private *priv) /* * It can operate in one of three modes: 0, 1 or Sleep. */ -void hibmc_set_power_mode(struct hibmc_drm_private *priv, - unsigned int power_mode) +void hibmc_set_power_mode(struct hibmc_drm_private *priv, u32 power_mode) { - unsigned int control_value = 0; + u32 control_value = 0; void __iomem *mmio = priv->mmio; - unsigned int input = 1; + u32 input = 1; if (power_mode > HIBMC_PW_MODE_CTL_MODE_SLEEP) return; @@ -144,8 +143,8 @@ void hibmc_set_power_mode(struct hibmc_drm_private *priv, void hibmc_set_current_gate(struct hibmc_drm_private *priv, unsigned int gate) { - unsigned int gate_reg; - unsigned int mode; + u32 gate_reg; + u32 mode; void __iomem *mmio = priv->mmio; /* Get current power mode. */ @@ -170,7 +169,7 @@ void hibmc_set_current_gate(struct hibmc_drm_private *priv, unsigned int gate) static void hibmc_hw_config(struct hibmc_drm_private *priv) { - unsigned int reg; + u32 reg; /* On hardware reset, power mode 0 is default. */ hibmc_set_power_mode(priv, HIBMC_PW_MODE_CTL_MODE_MODE0); diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h index 6a63502..5c4030d 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h @@ -33,8 +33,8 @@ struct hibmc_drm_private { /* hw */ void __iomem *mmio; void __iomem *fb_map; - unsigned long fb_base; - unsigned long fb_size; + u64 fb_base; + u64 fb_size; /* drm */ struct drm_device *dev; @@ -56,9 +56,9 @@ static inline struct hibmc_drm_private *to_hibmc_drm_private(struct drm_device * } void hibmc_set_power_mode(struct hibmc_drm_private *priv, - unsigned int power_mode); + u32 power_mode); void hibmc_set_current_gate(struct hibmc_drm_private *priv, - unsigned int gate); + u32 gate); int hibmc_de_init(struct hibmc_drm_private *priv); int hibmc_vdac_init(struct hibmc_drm_private *priv);
Consistently Use the same style of variable type in hibmc_drm_de.c and hibmc_drm_de.h. Signed-off-by: Tian Tao <tiantao6@hisilicon.com> --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 13 ++++++------- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 8 ++++---- 2 files changed, 10 insertions(+), 11 deletions(-)