Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp303618pxu; Thu, 15 Oct 2020 04:32:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVxyS2MJ0XtkBTeH7NtFD4cXPQlczs8kQ3Szj7H8zAs3/NWUbsbG61iuZ0k8QaafY4doHI X-Received: by 2002:a17:906:7016:: with SMTP id n22mr4176526ejj.402.1602761546427; Thu, 15 Oct 2020 04:32:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602761546; cv=none; d=google.com; s=arc-20160816; b=A01SAawywYNWWGfhzmp3SImWjwSAXQIWMV8e0R1x5ZzJKmN7M+BZhOSNyRJLqv0Jfn ipNCZvZrqLeoOKKbp2zVI3/Rt4HQrnHiUyQaZHPVDSiBpw9ATkhdF2me37HSSCmHblfT sTZoxJadCDnOx5+MaAq96anpOwX0NR8LLORSj19tS7Lz9gxRQUS8hIOGmoW8rUXwaoYn WI8aif6Oz+QisSZb6VyAINv5pAGgaluB172giyVxkigH91xWBBSeFNMVFYMsZiQtzyx7 Pr2QltDB7dzPeRXKNGF8f1a3DJfkuS1XNRVYWFMVcZu7q+deT1u/ihrxe/TeisEu5Uf9 kO9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=J2A33M+mJm+/As/CYSRlmFtcNYw8I5Smp2o2Vy9QLhA=; b=wZhZ/nznKfPV/1T7h117xw2zZXh0GB56TpMnU4Grkp84C08ESV8Feuhlj5YuTls2z3 I3mr2bOxUe8qDtpPZV7CGYBS6mPP/P7T2aYrxUgtduUnnwv36jzqEBc3/i6QC738RuLl lDcmNhJiv3e66nTNdEgNfUUrVNRwIJ53ACLoGBCqag3mGyWXz2ufEL3JzjXxopNsT7KA ntYACxWysaHytfyRfLuqyT9CjcyRvqToA2ZSxODjCuH1ow0zYWKVy3xsLbs1RnG/gj1M HKEouzO437r2WcWW1PHS5++eitZxSYmT1JUMM0PiiHn/37/ukOZQMBqjS5SD1NdprPfa o2og== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w8si1713053edu.395.2020.10.15.04.32.04; Thu, 15 Oct 2020 04:32:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388420AbgJOI7l (ORCPT + 99 others); Thu, 15 Oct 2020 04:59:41 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:15295 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388315AbgJOI7l (ORCPT ); Thu, 15 Oct 2020 04:59:41 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id D4D048F5487FF12A17A7; Thu, 15 Oct 2020 16:59:38 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.487.0; Thu, 15 Oct 2020 16:59:30 +0800 From: Tian Tao To: , , , , , , , , CC: Subject: [PATCH drm/hisilicon v2 2/2] drm/hisilicon: Use the same style of variable type in hibmc_drm_drv Date: Thu, 15 Oct 2020 17:00:17 +0800 Message-ID: <1602752417-20598-3-git-send-email-tiantao6@hisilicon.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1602752417-20598-1-git-send-email-tiantao6@hisilicon.com> References: <1602752417-20598-1-git-send-email-tiantao6@hisilicon.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Consistently Use the same style of variable type in hibmc_drm_drv.c and hibmc_drm_drv.h. Signed-off-by: Tian Tao Acked-by: Thomas Zimmermann --- 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; /* 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); -- 2.7.4