diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-03-25 23:06:49 +0300 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-04-02 11:40:46 +0300 |
| commit | e14ab3037383f4e3d026e2aea1ad53644a3735ed (patch) | |
| tree | 73892c8d5e5599a39de9ebecac1415515e8de07b | |
| parent | c0af492c872b949cf3e8b91ef66094bc5f81e181 (diff) | |
| download | linux-e14ab3037383f4e3d026e2aea1ad53644a3735ed.tar.xz | |
drm/ast: Allocate instance of struct ast_i2c_chan with managed helpers
Replace kzalloc() with drmm_kzalloc() and thereby put the release of
the I2C instance into a separate action. Avoids explicit error roll-
back in ast_i2c_chan_create(). No functional changes.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sui Jingfeng <sui.jingfeng@linux.dev>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240325200855.21150-5-tzimmermann@suse.de
| -rw-r--r-- | drivers/gpu/drm/ast/ast_i2c.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/ast/ast_i2c.c b/drivers/gpu/drm/ast/ast_i2c.c index c3046223a491..dc28a5cbb1c2 100644 --- a/drivers/gpu/drm/ast/ast_i2c.c +++ b/drivers/gpu/drm/ast/ast_i2c.c @@ -107,7 +107,6 @@ static void ast_i2c_release(struct drm_device *dev, void *res) struct ast_i2c_chan *i2c = res; i2c_del_adapter(&i2c->adapter); - kfree(i2c); } struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev) @@ -115,7 +114,7 @@ struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev) struct ast_i2c_chan *i2c; int ret; - i2c = kzalloc(sizeof(struct ast_i2c_chan), GFP_KERNEL); + i2c = drmm_kzalloc(dev->dev, sizeof(*i2c), GFP_KERNEL); if (!i2c) return ERR_PTR(-ENOMEM); @@ -137,7 +136,7 @@ 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_kfree; + return ERR_PTR(ret); } ret = drmm_add_action_or_reset(dev, ast_i2c_release, i2c); @@ -145,8 +144,4 @@ struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev) return ERR_PTR(ret); return i2c; - -out_kfree: - kfree(i2c); - return ERR_PTR(ret); } |