drm/udl: Rename struct udl_drm_connector to struct udl_connector

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

diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index fade4c7adbf78eade741f65765a4b80bc24bfc8e..3c806862638485821c1751e851f53a7f5c05a421 100644 (file)
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -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)
 {
-       struct udl_drm_connector *udl_connector =
-                                       container_of(connector,
-                                       struct udl_drm_connector,
-                                       connector);
+       struct udl_connector *udl_connector = to_udl_connector(connector);
 
        drm_connector_update_edid_property(connector, udl_connector->edid);
        if (udl_connector->edid)
@@ -74,10 +71,7 @@ static enum drm_connector_status
 udl_detect(struct drm_connector *connector, bool force)
 {
        struct udl_device *udl = to_udl(connector->dev);
-       struct udl_drm_connector *udl_connector =
-                                       container_of(connector,
-                                       struct udl_drm_connector,
-                                       connector);
+       struct udl_connector *udl_connector = to_udl_connector(connector);
 
        /* cleanup previous edid */
        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)
 {
-       struct udl_drm_connector *udl_connector =
-                                       container_of(connector,
-                                       struct udl_drm_connector,
-                                       connector);
+       struct udl_connector *udl_connector = to_udl_connector(connector);
 
        drm_connector_cleanup(connector);
        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 udl_drm_connector *udl_connector;
+       struct udl_connector *udl_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)
                return ERR_PTR(-ENOMEM);
 

diff --git a/drivers/gpu/drm/udl/udl_connector.h b/drivers/gpu/drm/udl/udl_connector.h
index 7f2d392df17377c81ce44b5fb1764e90366e4401..74ad68fd3cc9f35d1430fed0dd5b2f00b03f1295 100644 (file)
--- a/drivers/gpu/drm/udl/udl_connector.h
+++ b/drivers/gpu/drm/udl/udl_connector.h
@@ -1,15 +1,21 @@
 #ifndef __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 udl_drm_connector {
+struct udl_connector {
        struct drm_connector connector;
        /* last udl_detect 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__