Commit 59a811fa authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221006095355.23579-2-tzimmermann@suse.de
parent 43d3f3b9
Loading
Loading
Loading
Loading
+5 −14
Original line number Diff line number Diff line
@@ -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);

+8 −2
Original line number Diff line number Diff line
#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__