drm/hisilicon: Use the same style of variable type in hibmc_drm_drv

Consistently Use the same style of variable type in hibmc_drm_drv.c and
hibmc_drm_drv.h.

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1602808711-65193-3-git-send-email-tiantao6@hisilicon.com

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
index 5632bcea791e7c5221c9789a5f33d688ffe2c2a4..0c1b40d25ac4aedc94b589cdcc8ecded93799b6d 100644 (file)
--- 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 6a635027f75840eba2f1e4eb334d4a5fbe454671..f310a83d9c48d89c9d1160130f03c6e5bbbe4ff1 100644 (file)
--- 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;
+       resource_size_t  fb_base;
+       resource_size_t  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);