| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <de254b5bd5304d4381fe0738fc52762b@hisilicon.com>
Date: Fri, 6 Mar 2020 03:59:58 +0000
From: "tiantao (H)" <tiantao6@...ilicon.com>
To: "tiantao (H)" <tiantao6@...ilicon.com>,
"Chenfeng (puck)" <puck.chen@...ilicon.com>,
"airlied@...ux.ie" <airlied@...ux.ie>,
"daniel@...ll.ch" <daniel@...ll.ch>,
"tzimmermann@...e.de" <tzimmermann@...e.de>,
"kraxel@...hat.com" <kraxel@...hat.com>,
"alexander.deucher@....com" <alexander.deucher@....com>,
"tglx@...utronix.de" <tglx@...utronix.de>,
"dri-devel@...ts.freedesktop.org" <dri-devel@...ts.freedesktop.org>,
"xinliang.liu@...aro.org" <xinliang.liu@...aro.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
CC: Linuxarm <linuxarm@...wei.com>
Subject: 答复: [PATCH] drm/hisilicon: Code cleanup for hibmc_drv_vdac
Hi All：
Sorry，please ignore this patch.
Best
-----邮件原件-----
发件人: Linuxarm [mailto:linuxarm-bounces@...wei.com] 代表 Tian Tao
发送时间: 2020年3月6日 11:43
收件人: Chenfeng (puck) <puck.chen@...ilicon.com>; airlied@...ux.ie; daniel@...ll.ch; tzimmermann@...e.de; kraxel@...hat.com; alexander.deucher@....com; tglx@...utronix.de; dri-devel@...ts.freedesktop.org; xinliang.liu@...aro.org; linux-kernel@...r.kernel.org
抄送: Linuxarm <linuxarm@...wei.com>
主题: [PATCH] drm/hisilicon: Code cleanup for hibmc_drv_vdac
code cleanup for hibmc_drv_vdac.c, no actual function changes.
Signed-off-by: Tian Tao <tiantao6@...ilicon.com>
Signed-off-by: Gong junjie <gongjunjie2@...wei.com>
---
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 49 ++++++++----------------
1 file changed, 16 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
index 678ac2e..f0e6bb8 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
@@ -52,32 +52,6 @@ static const struct drm_connector_funcs hibmc_connector_funcs = {
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
};
-static struct drm_connector *
-hibmc_connector_init(struct hibmc_drm_private *priv) -{
- struct drm_device *dev = priv->dev;
- struct drm_connector *connector;
- int ret;
-
- connector = devm_kzalloc(dev->dev, sizeof(*connector), GFP_KERNEL);
- if (!connector) {
- DRM_ERROR("failed to alloc memory when init connector\n");
- return ERR_PTR(-ENOMEM);
- }
-
- ret = drm_connector_init(dev, connector,
- &hibmc_connector_funcs,
- DRM_MODE_CONNECTOR_VGA);
- if (ret) {
- DRM_ERROR("failed to init connector: %d\n", ret);
- return ERR_PTR(ret);
- }
- drm_connector_helper_add(connector,
- &hibmc_connector_helper_funcs);
-
- return connector;
-}
-
static void hibmc_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode,
struct drm_display_mode *adj_mode) @@ -109,13 +83,6 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv)
struct drm_connector *connector;
int ret;
- connector = hibmc_connector_init(priv);
- if (IS_ERR(connector)) {
- DRM_ERROR("failed to create connector: %ld\n",
- PTR_ERR(connector));
- return PTR_ERR(connector);
- }
-
encoder = devm_kzalloc(dev->dev, sizeof(*encoder), GFP_KERNEL);
if (!encoder) {
DRM_ERROR("failed to alloc memory when init encoder\n"); @@ -131,6 +98,22 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv)
}
drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs);
+ connector = devm_kzalloc(dev->dev, sizeof(*connector), GFP_KERNEL);
+ if (!connector) {
+ DRM_ERROR("failed to alloc memory when init connector\n");
+ return -ENOMEM;
+ }
+
+ ret = drm_connector_init(dev, connector,
+ &hibmc_connector_funcs,
+ DRM_MODE_CONNECTOR_VGA);
+ if (ret) {
+ DRM_ERROR("failed to init connector: %d\n", ret);
+ return ret;
+ }
+
+ drm_connector_helper_add(connector, &hibmc_connector_helper_funcs);
+ drm_connector_register(connector);
drm_connector_attach_encoder(connector, encoder);
return 0;
--
2.7.4
_______________________________________________
Linuxarm mailing list
Linuxarm@...wei.com
http://hulk.huawei.com/mailman/listinfo/linuxarm
Powered by blists - more mailing lists