From nobody Tue Dec 16 06:37:18 2025 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DE8A2727FC for ; Mon, 15 Dec 2025 09:47:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765792068; cv=none; b=MbiJE3GCNK/nag8yXkavsVXZGgjqOWbG36vJtDwV2NJTS76glai8devZM5Vei/iCdp/Yct+drf7HsGwcTN+INRGOP+1i+tqGAimYqAeSGx2SGN7FCMpmB7se3w50PMjGHPuBe06IPO0mqLJgeZgZ+jncQItp6cmQwcQVpZs2fnQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765792068; c=relaxed/simple; bh=j1XkYhWQ1IN9JL+Wb1Eozaof9eyPZLQtwZeEnUcZ+0s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ctKtGG0OpyLxfO4ErcJa5dEFQoerei+JBPa9pOZZcWV9MgtvQ7XOPlTBguWZxXGZLHKG3VJ6DYoaFazVB7IB1t9qupRcoLgfwCamTPqS9WTDhQYxBBb4AP4X4uKt81yE7C4XkGiHpgKELFJqJJ5RuljTipSr98S0x6VHzjgxxeg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RT+E+ZT4; arc=none smtp.client-ip=209.85.167.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RT+E+ZT4" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-59584301f0cso3440117e87.0 for ; Mon, 15 Dec 2025 01:47:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765792064; x=1766396864; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=SDgTtvl+RBHpILPhZonQKwu9nxIYlCiGLZNaksqSUeE=; b=RT+E+ZT4c4kv819SHK3cp/HbU/mOGz0Ubc51n7SACQgHulsFz+wj0jm153MrVrBVZt lPlFBbaKw/INddpLEbjxzBEd5bOHqp98vPYNdF8gy7EA4o4IWB6MmdpzIDsXHrZczvR9 Lb7yYNJRSLI7Fh/oytmEJJgxpIM810oKV8z2LH4sp1z+r/xE9BSBqWRmvbTRiiKcdTa+ yV/6o01lzEznzh/Cb6xn5XyeDysnNn9sNyZHrKgxlldCoZXRY6BsxgKjSTEkRyEYPVHT X+/nFzr9h1tWVzhZK4zWMO8ubb8x3TSdmdDNeiUj1vbwNUb8fb+AlahATkypGFljN0kl ydAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765792064; x=1766396864; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=SDgTtvl+RBHpILPhZonQKwu9nxIYlCiGLZNaksqSUeE=; b=YN8zlqbDot9+q3QxJTbqfnGNJcR75/ptszPH6em3+hJGCUDfa0L+GpdUFXhdHqaf9X CgQ5RH01ENpzTTO4ASYxwmnTfjTpZ01J1yYhJ4A0fduhlyrW1ALeWYwVcJ8Cyb1hh4zo 3vlu53BIilppmpy3hkXyp6GdCX1IrovM7/tLdgQ5NVyY1FtX3r/p0uynbNmDwp6HJ596 75Ot0Dv5BtlaU01cOrQ50v+HJQdrX9WKHzWs5DREQiAX8ecPvzpbaaHadEQe9j08srm6 cnb306ipZGoqoN3bRDcJb3RdTlcEr66TrvSPKR2MAkW50kbfNnD1MbgJ6aLapphgi1sg tVCA== X-Forwarded-Encrypted: i=1; AJvYcCWUqYldEJ0LPnkZkNx8AqLjsnjyMW25UwpATIjgfOMaShOudBUDEgGJWCyE7myEA8DGPLexjZe19Vgxs+w=@vger.kernel.org X-Gm-Message-State: AOJu0Yyh9ADltGm2HhbLN/ZisCTE4IrVPt3ZMJAS2HwBoo8wN31JwwOF cEEs/w0gBcuodULp025+qykB8HzMOsi07OyTrekmENECO1vunyBDAKeV X-Gm-Gg: AY/fxX6UIZ4mcGK9QIVlC7Z1gtTmsS8Os3JzYxdRM5/GbAgmbhM0Jh4utULG9TwbNxq 6ETf34SzRJ+czm5xfjBr/9tmZ9sqsJzztz7DXdNlBMlzwtv5y6lExPJd1JFnHyKHGEg7lvmKkhO Jg7hcVObzCyt2EBQYQVaxZ2dQewYbO4A/Hardj7XR6b3rzdIRWkS/XXqjGI4txbLadCg9RyZM7s 4agp/Ugr0gy5n1i3Yqg3xCjpnltYx7D2Mc92C93QLn91ZE5bmLQhQdTfTiKMs/7NbaidpcKfnM9 q9k3bzc94/q713lc0AzTB1gtJe6s3DBxZF0VTXcLK9VLAxjxk7bOnM98D4j0wM6tYN2h1un5D9A FlXQLc/eMXYxtJLu3uTgTolb23R8a8gFSLN+fyW3NT4pSM/8VRIeBZvz20c1nTd6zGirEVQadoV lboa05Q053MZtDgiByvfzkLef/bg9rfi55TLVC0iPGl+ZYrnyUGyCI2X7gdI0V0iXj+bc= X-Google-Smtp-Source: AGHT+IHdUfqXczYyj1Cly0PG2XtJ/rJFxO0ARb+sa77t/57wN4yHBcgga29yLFYYO+CC/kcqJd+Gyg== X-Received: by 2002:ac2:530c:0:b0:598:fac0:497d with SMTP id 2adb3069b0e04-598fac04a37mr2223121e87.15.1765792063467; Mon, 15 Dec 2025 01:47:43 -0800 (PST) Received: from [192.168.1.168] (83-233-6-197.cust.bredband2.com. [83.233.6.197]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-598f2f37ae8sm5397546e87.15.2025.12.15.01.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Dec 2025 01:47:42 -0800 (PST) From: Marcus Folkesson Date: Mon, 15 Dec 2025 10:46:43 +0100 Subject: [PATCH v3 1/7] drm/sitronix/st7571-i2c: rename 'struct drm_device' in st7571_device Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251215-st7571-split-v3-1-d5f3205c3138@gmail.com> References: <20251215-st7571-split-v3-0-d5f3205c3138@gmail.com> In-Reply-To: <20251215-st7571-split-v3-0-d5f3205c3138@gmail.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Javier Martinez Canillas , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Marcus Folkesson X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=7034; i=marcus.folkesson@gmail.com; h=from:subject:message-id; bh=j1XkYhWQ1IN9JL+Wb1Eozaof9eyPZLQtwZeEnUcZ+0s=; b=owEBbQKS/ZANAwAKAYiATm9ZXVIyAcsmYgBpP9kcj6ovR5fjkalkgb6odPj6NkozJ1jONh1N1 s5kmRMgkQuJAjMEAAEKAB0WIQQFUaLotmy1TWTBLGWIgE5vWV1SMgUCaT/ZHAAKCRCIgE5vWV1S MsUkEADaiXrbKZdRg81hP/WC8znvUiliXA384R8U6N0NXYvtq4ISoFyLO+vvT/PRgtX75G1cwPn bHL3yPu7RSg+T+Ah3h2nH6KavExYUoAhnp12D22UPOSvn39Nnuh7IP70Os2FPMN6TaZpdx7lwNj kpE6/DRiCOtH4mkjMNWJMApOl7FAoQWY9I9d5WmUKXZXu47h/K380cg5rcFCZOeF+rO0j2Ppb+G gaY3MhhohSl+SjVZg2pWwRiXuKQ5WLfxGtQQGOkeMTcneJPXaWLUtI7XpAkv9qIZluKVkoIBq+B owUb109M3HZsA9Gx3AD9BdMPthRCbJNASnsTFVStO4zfOTS3noK2wmHkVddVmveuGDo4mdPf/cm 9Em/xIxC9xt+Esa7/ZeJlyU/4lqAOcMr9Ng3g1dbLfo7vrN5SqKXIFNoAIzJJq7M9BdwcCZhGRb jGEwSAdN6i6dTpi4d2tp+EE841A9uPi7ZXBy6JkPjQy/XaxWR48V+Yo6mZAxFYzd/28brwFi7R3 U8AYm/554hY+AAZYeh2qsoGErp4UfJoGAfc8gxtkZQN0u0khChLgqyL1vt3e4UkOJeo7HPxpz5J WfepSRf0Ev1DTr95RmisOydrWhvkGPBiAjI7WTNXvHz0kOUSa9cI9Lx5Sn4hJer3cduk4E4RYFH khCTQTME27nUy6Q== X-Developer-Key: i=marcus.folkesson@gmail.com; a=openpgp; fpr=AB91D46C7E0F6E6FB2AB640EC0FE25D598F6C127 Rename st7571_device.dev to st7571_device.drm in preparation to introduce a 'struct device' member to this structure. Reviewed-by: Javier Martinez Canillas Signed-off-by: Marcus Folkesson --- drivers/gpu/drm/sitronix/st7571-i2c.c | 60 +++++++++++++++++--------------= ---- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/sitronix/st7571-i2c.c b/drivers/gpu/drm/sitron= ix/st7571-i2c.c index 4e73c8b415d6..71814a3eb93b 100644 --- a/drivers/gpu/drm/sitronix/st7571-i2c.c +++ b/drivers/gpu/drm/sitronix/st7571-i2c.c @@ -112,7 +112,7 @@ struct st7571_panel_format { }; =20 struct st7571_device { - struct drm_device dev; + struct drm_device drm; =20 struct drm_plane primary_plane; struct drm_crtc crtc; @@ -166,9 +166,9 @@ struct st7571_device { u8 *row; }; =20 -static inline struct st7571_device *drm_to_st7571(struct drm_device *dev) +static inline struct st7571_device *drm_to_st7571(struct drm_device *drm) { - return container_of(dev, struct st7571_device, dev); + return container_of(drm, struct st7571_device, drm); } =20 static int st7571_regmap_write(void *context, const void *data, size_t cou= nt) @@ -467,7 +467,7 @@ static void st7571_primary_plane_helper_atomic_update(s= truct drm_plane *plane, struct drm_shadow_plane_state *shadow_plane_state =3D to_drm_shadow_plane= _state(plane_state); struct drm_framebuffer *fb =3D plane_state->fb; struct drm_atomic_helper_damage_iter iter; - struct drm_device *dev =3D plane->dev; + struct drm_device *drm =3D plane->dev; struct drm_rect damage; struct st7571_device *st7571 =3D drm_to_st7571(plane->dev); int ret, idx; @@ -479,7 +479,7 @@ static void st7571_primary_plane_helper_atomic_update(s= truct drm_plane *plane, if (ret) return; =20 - if (!drm_dev_enter(dev, &idx)) + if (!drm_dev_enter(drm, &idx)) goto out_drm_gem_fb_end_cpu_access; =20 drm_atomic_helper_damage_iter_init(&iter, old_plane_state, plane_state); @@ -501,11 +501,11 @@ static void st7571_primary_plane_helper_atomic_update= (struct drm_plane *plane, static void st7571_primary_plane_helper_atomic_disable(struct drm_plane *p= lane, struct drm_atomic_state *state) { - struct drm_device *dev =3D plane->dev; + struct drm_device *drm =3D plane->dev; struct st7571_device *st7571 =3D drm_to_st7571(plane->dev); int idx; =20 - if (!drm_dev_enter(dev, &idx)) + if (!drm_dev_enter(drm, &idx)) return; =20 st7571_fb_clear_screen(st7571); @@ -621,20 +621,20 @@ static struct drm_display_mode st7571_mode(struct st7= 571_device *st7571) =20 static int st7571_mode_config_init(struct st7571_device *st7571) { - struct drm_device *dev =3D &st7571->dev; + struct drm_device *drm =3D &st7571->drm; const struct st7571_panel_constraints *constraints =3D &st7571->pdata->co= nstraints; int ret; =20 - ret =3D drmm_mode_config_init(dev); + ret =3D drmm_mode_config_init(drm); if (ret) return ret; =20 - dev->mode_config.min_width =3D constraints->min_ncols; - dev->mode_config.min_height =3D constraints->min_nlines; - dev->mode_config.max_width =3D constraints->max_ncols; - dev->mode_config.max_height =3D constraints->max_nlines; - dev->mode_config.preferred_depth =3D 24; - dev->mode_config.funcs =3D &st7571_mode_config_funcs; + drm->mode_config.min_width =3D constraints->min_ncols; + drm->mode_config.min_height =3D constraints->min_nlines; + drm->mode_config.max_width =3D constraints->max_ncols; + drm->mode_config.max_height =3D constraints->max_nlines; + drm->mode_config.preferred_depth =3D 24; + drm->mode_config.funcs =3D &st7571_mode_config_funcs; =20 return 0; } @@ -643,10 +643,10 @@ static int st7571_plane_init(struct st7571_device *st= 7571, const struct st7571_panel_format *pformat) { struct drm_plane *primary_plane =3D &st7571->primary_plane; - struct drm_device *dev =3D &st7571->dev; + struct drm_device *drm =3D &st7571->drm; int ret; =20 - ret =3D drm_universal_plane_init(dev, primary_plane, 0, + ret =3D drm_universal_plane_init(drm, primary_plane, 0, &st7571_primary_plane_funcs, pformat->formats, pformat->nformats, @@ -665,10 +665,10 @@ static int st7571_crtc_init(struct st7571_device *st7= 571) { struct drm_plane *primary_plane =3D &st7571->primary_plane; struct drm_crtc *crtc =3D &st7571->crtc; - struct drm_device *dev =3D &st7571->dev; + struct drm_device *drm =3D &st7571->drm; int ret; =20 - ret =3D drm_crtc_init_with_planes(dev, crtc, primary_plane, NULL, + ret =3D drm_crtc_init_with_planes(drm, crtc, primary_plane, NULL, &st7571_crtc_funcs, NULL); if (ret) return ret; @@ -682,10 +682,10 @@ static int st7571_encoder_init(struct st7571_device *= st7571) { struct drm_encoder *encoder =3D &st7571->encoder; struct drm_crtc *crtc =3D &st7571->crtc; - struct drm_device *dev =3D &st7571->dev; + struct drm_device *drm =3D &st7571->drm; int ret; =20 - ret =3D drm_encoder_init(dev, encoder, &st7571_encoder_funcs, DRM_MODE_EN= CODER_NONE, NULL); + ret =3D drm_encoder_init(drm, encoder, &st7571_encoder_funcs, DRM_MODE_EN= CODER_NONE, NULL); if (ret) return ret; =20 @@ -700,10 +700,10 @@ static int st7571_connector_init(struct st7571_device= *st7571) { struct drm_connector *connector =3D &st7571->connector; struct drm_encoder *encoder =3D &st7571->encoder; - struct drm_device *dev =3D &st7571->dev; + struct drm_device *drm =3D &st7571->drm; int ret; =20 - ret =3D drm_connector_init(dev, connector, &st7571_connector_funcs, + ret =3D drm_connector_init(drm, connector, &st7571_connector_funcs, DRM_MODE_CONNECTOR_Unknown); if (ret) return ret; @@ -934,15 +934,15 @@ static int st7571_lcd_init(struct st7571_device *st75= 71) static int st7571_probe(struct i2c_client *client) { struct st7571_device *st7571; - struct drm_device *dev; + struct drm_device *drm; int ret; =20 st7571 =3D devm_drm_dev_alloc(&client->dev, &st7571_driver, - struct st7571_device, dev); + struct st7571_device, drm); if (IS_ERR(st7571)) return PTR_ERR(st7571); =20 - dev =3D &st7571->dev; + drm =3D &st7571->drm; st7571->client =3D client; i2c_set_clientdata(client, st7571); st7571->pdata =3D device_get_match_data(&client->dev); @@ -1010,14 +1010,14 @@ static int st7571_probe(struct i2c_client *client) return dev_err_probe(&client->dev, ret, "Failed to initialize connector\n"); =20 - drm_mode_config_reset(dev); + drm_mode_config_reset(drm); =20 - ret =3D drm_dev_register(dev, 0); + ret =3D drm_dev_register(drm, 0); if (ret) return dev_err_probe(&client->dev, ret, "Failed to register DRM device\n"); =20 - drm_client_setup(dev, NULL); + drm_client_setup(drm, NULL); return 0; } =20 @@ -1025,7 +1025,7 @@ static void st7571_remove(struct i2c_client *client) { struct st7571_device *st7571 =3D i2c_get_clientdata(client); =20 - drm_dev_unplug(&st7571->dev); + drm_dev_unplug(&st7571->drm); } =20 static const struct st7571_panel_data st7567_config =3D { --=20 2.51.2