From: Thomas Zimmermann <tzimmermann@suse.de>
To: airlied@redhat.com, daniel@ffwll.ch, sam@ravnborg.org,
emil.l.velikov@gmail.com, kraxel@redhat.com,
yc_chen@aspeedtech.com
Cc: Thomas Zimmermann <tzimmermann@suse.de>, dri-devel@lists.freedesktop.org
Subject: [PATCH 03/13] drm/ast: Embed I2C fields in struct ast_connector
Date: Tue, 28 Jul 2020 09:44:15 +0200 [thread overview]
Message-ID: <20200728074425.2749-4-tzimmermann@suse.de> (raw)
In-Reply-To: <20200728074425.2749-1-tzimmermann@suse.de>
With the I2C fields embedded in struct ast_connector, the related call
to kzalloc() can be removed.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/ast/ast_drv.h | 3 +--
drivers/gpu/drm/ast/ast_mode.c | 33 ++++++++++-----------------------
2 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index e3a264ac7ee2..d303df568099 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -98,7 +98,6 @@ enum ast_tx_chip {
#define AST_HWC_SIGNATURE_HOTSPOTX 0x14
#define AST_HWC_SIGNATURE_HOTSPOTY 0x18
-
struct ast_private {
struct drm_device *dev;
@@ -234,7 +233,7 @@ struct ast_i2c_chan {
struct ast_connector {
struct drm_connector base;
- struct ast_i2c_chan *i2c;
+ struct ast_i2c_chan i2c;
};
#define to_ast_connector(x) container_of(x, struct ast_connector, base)
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 45be020afcad..f421a60d8a96 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -591,15 +591,10 @@ static void ast_i2c_setsda(void *i2c_priv, int data)
}
}
-static struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev)
+static int ast_i2c_init(struct ast_i2c_chan *i2c, struct drm_device *dev)
{
- struct ast_i2c_chan *i2c;
int ret;
- i2c = kzalloc(sizeof(struct ast_i2c_chan), GFP_KERNEL);
- if (!i2c)
- return NULL;
-
i2c->adapter.owner = THIS_MODULE;
i2c->adapter.class = I2C_CLASS_DDC;
i2c->adapter.dev.parent = &dev->pdev->dev;
@@ -618,20 +613,17 @@ static struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev)
ret = i2c_bit_add_bus(&i2c->adapter);
if (ret) {
drm_err(dev, "Failed to register bit i2c\n");
- goto out_free;
+ return ret;
}
i2c->dev = dev; /* signals presence of I2C support */
- return i2c;
-out_free:
- kfree(i2c);
- return NULL;
+ return 0;
}
static bool ast_i2c_is_initialized(struct ast_i2c_chan *i2c)
{
- return i2c && !!i2c->dev;
+ return !!i2c->dev;
}
static void ast_i2c_fini(struct ast_i2c_chan *i2c)
@@ -642,12 +634,6 @@ static void ast_i2c_fini(struct ast_i2c_chan *i2c)
i2c->dev = NULL; /* clear to signal absence of I2C support */
}
-static void ast_i2c_destroy(struct ast_i2c_chan *i2c)
-{
- ast_i2c_fini(i2c);
- kfree(i2c);
-}
-
/*
* Primary plane
*/
@@ -1066,7 +1052,7 @@ static int ast_get_modes(struct drm_connector *connector)
{
struct ast_connector *ast_connector = to_ast_connector(connector);
struct ast_private *ast = to_ast_private(connector->dev);
- struct ast_i2c_chan *i2c = ast_connector->i2c;
+ struct ast_i2c_chan *i2c = &ast_connector->i2c;
struct edid *edid;
int ret;
bool flags = false;
@@ -1154,7 +1140,7 @@ static enum drm_mode_status ast_mode_valid(struct drm_connector *connector,
static void ast_connector_destroy(struct drm_connector *connector)
{
struct ast_connector *ast_connector = to_ast_connector(connector);
- ast_i2c_destroy(ast_connector->i2c);
+ ast_i2c_fini(&ast_connector->i2c);
drm_connector_cleanup(connector);
kfree(connector);
}
@@ -1177,20 +1163,21 @@ static int ast_connector_init(struct drm_device *dev)
struct ast_connector *ast_connector;
struct drm_connector *connector;
struct drm_encoder *encoder;
+ int ret;
ast_connector = kzalloc(sizeof(struct ast_connector), GFP_KERNEL);
if (!ast_connector)
return -ENOMEM;
connector = &ast_connector->base;
- ast_connector->i2c = ast_i2c_create(dev);
- if (!ast_connector->i2c)
+ ret = ast_i2c_init(&ast_connector->i2c, dev);
+ if (ret)
drm_err(dev, "failed to add ddc bus for connector\n");
drm_connector_init_with_ddc(dev, connector,
&ast_connector_funcs,
DRM_MODE_CONNECTOR_VGA,
- &ast_connector->i2c->adapter);
+ &ast_connector->i2c.adapter);
drm_connector_helper_add(connector, &ast_connector_helper_funcs);
--
2.27.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-07-28 7:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 7:44 [PATCH 00/13] drm/ast: Convert to managed initialization Thomas Zimmermann
2020-07-28 7:44 ` [PATCH 01/13] drm/ast: Move I2C code within ast_mode.c Thomas Zimmermann
2020-07-28 18:04 ` Sam Ravnborg
2020-07-30 9:18 ` Thomas Zimmermann
2020-07-28 7:44 ` [PATCH 02/13] drm/ast: Test if I2C support has been initialized Thomas Zimmermann
2020-07-28 17:38 ` Sam Ravnborg
2020-07-28 7:44 ` Thomas Zimmermann [this message]
2020-07-28 7:44 ` [PATCH 04/13] drm/ast: Managed release of I2C adapter Thomas Zimmermann
2020-07-28 9:23 ` daniel
2020-07-28 9:33 ` Thomas Zimmermann
2020-07-30 9:19 ` Thomas Zimmermann
2020-07-28 18:06 ` Sam Ravnborg
2020-07-30 9:23 ` Thomas Zimmermann
2020-07-28 7:44 ` [PATCH 05/13] drm/ast: Embed CRTC and connector in struct ast_private Thomas Zimmermann
2020-07-28 7:44 ` [PATCH 06/13] drm/ast: Separate DRM driver from PCI code Thomas Zimmermann
2020-07-28 7:44 ` [PATCH 07/13] drm/ast: Replace driver load/unload functions with device create/destroy Thomas Zimmermann
2020-07-28 7:44 ` [PATCH 08/13] drm/ast: Replace struct_drm_device.dev_private with to_ast_private() Thomas Zimmermann
2020-07-28 7:44 ` [PATCH 09/13] drm/ast: Don't use ast->dev if dev is available Thomas Zimmermann
2020-07-28 7:44 ` [PATCH 10/13] drm/ast: Embed struct drm_device in struct ast_private Thomas Zimmermann
2020-07-28 7:44 ` [PATCH 11/13] drm/ast: Managed release of ast firmware Thomas Zimmermann
2020-07-28 9:17 ` daniel
2020-07-28 9:32 ` Thomas Zimmermann
2020-07-28 9:34 ` daniel
2020-07-28 7:44 ` [PATCH 12/13] drm/ast: Manage release of firmware backup memory Thomas Zimmermann
2020-07-28 9:18 ` daniel
2020-07-28 7:44 ` [PATCH 13/13] drm/ast: Managed device release Thomas Zimmermann
2020-07-28 18:10 ` [PATCH 00/13] drm/ast: Convert to managed initialization Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200728074425.2749-4-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=kraxel@redhat.com \
--cc=sam@ravnborg.org \
--cc=yc_chen@aspeedtech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).