shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/udl: Rename struct udl_drm_connector to struct udl_connector

Browse Source 
[ Upstream commit 59a811faa7 ]

Remove the _drm_ infix from struct udl_drm_connector and introduce a
macro for upcasting from struct drm_connector. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221006095355.23579-2-tzimmermann@suse.de
Stable-dep-of: 5aed213c7c6c ("drm/udl: Remove DRM_CONNECTOR_POLL_HPD")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Thomas Zimmermann
2022-10-06 11:53:40 +02:00
committed by Greg Kroah-Hartman
parent 7e372c7c43
commit 34d1582dee
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/udl/udl_connector.c
View File

@@ -46,10 +46,7 @@ static int udl_get_edid_block(void *data, u8 *buf, unsigned int block,
static int udl_get_modes(struct drm_connector *connector) static int udl_get_modes(struct drm_connector *connector)
{ {
struct udl_drm_connector *udl_connector = struct udl_connector *udl_connector = to_udl_connector(connector);
container_of(connector,
struct udl_drm_connector,
connector);
drm_connector_update_edid_property(connector, udl_connector->edid); drm_connector_update_edid_property(connector, udl_connector->edid);
if (udl_connector->edid) if (udl_connector->edid)
@@ -74,10 +71,7 @@ static enum drm_connector_status
udl_detect(struct drm_connector *connector, bool force) udl_detect(struct drm_connector *connector, bool force)
{ {
struct udl_device *udl = to_udl(connector->dev); struct udl_device *udl = to_udl(connector->dev);
struct udl_drm_connector *udl_connector = struct udl_connector *udl_connector = to_udl_connector(connector);
container_of(connector,
struct udl_drm_connector,
connector);
/* cleanup previous edid */ /* cleanup previous edid */
if (udl_connector->edid != NULL) { if (udl_connector->edid != NULL) {
@@ -94,10 +88,7 @@ udl_detect(struct drm_connector *connector, bool force)
static void udl_connector_destroy(struct drm_connector *connector) static void udl_connector_destroy(struct drm_connector *connector)
{ {
struct udl_drm_connector *udl_connector = struct udl_connector *udl_connector = to_udl_connector(connector);
container_of(connector,
struct udl_drm_connector,
connector);
drm_connector_cleanup(connector); drm_connector_cleanup(connector);
kfree(udl_connector->edid); kfree(udl_connector->edid);
@@ -120,10 +111,10 @@ static const struct drm_connector_funcs udl_connector_funcs = {
struct drm_connector *udl_connector_init(struct drm_device *dev) struct drm_connector *udl_connector_init(struct drm_device *dev)
{ {
struct udl_drm_connector *udl_connector; struct udl_connector *udl_connector;
struct drm_connector *connector; struct drm_connector *connector;
udl_connector = kzalloc(sizeof(struct udl_drm_connector), GFP_KERNEL); udl_connector = kzalloc(sizeof(*udl_connector), GFP_KERNEL);
if (!udl_connector) if (!udl_connector)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);

10
drivers/gpu/drm/udl/udl_connector.h
View File

@@ -1,15 +1,21 @@
#ifndef __UDL_CONNECTOR_H__ #ifndef __UDL_CONNECTOR_H__
#define __UDL_CONNECTOR_H__ #define __UDL_CONNECTOR_H__
#include <drm/drm_crtc.h> #include <linux/container_of.h>
#include <drm/drm_connector.h>
struct edid; struct edid;
struct udl_drm_connector { struct udl_connector {
struct drm_connector connector; struct drm_connector connector;
/* last udl_detect edid */ /* last udl_detect edid */
struct edid *edid; struct edid *edid;
}; };
static inline struct udl_connector *to_udl_connector(struct drm_connector *connector)
{
return container_of(connector, struct udl_connector, connector);
}
#endif //__UDL_CONNECTOR_H__ #endif //__UDL_CONNECTOR_H__