From mboxrd@z Thu Jan 1 00:00:00 1970 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 52BCE3074B0 for ; Tue, 2 Dec 2025 08:26:13 +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=1764663977; cv=none; b=J3fAyAhce1ceH0vcC7+kFrywJtI9/zHf57ch1AkbQDrIwSvo7+9pZCIhbKQNPGDYaghxVIjLimCtg7hlLIqFtWeodDwiFREL8d0ojvYeUVJEvEMMzP0mjrIApjtNoJ1+5qQSYsrZuyQHJTSCnYbv4RpcMLGtW6uNr0LATsycxA4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764663977; c=relaxed/simple; bh=pz5GhbAytN7MzkdHAjHi7UGCmM26Ce8ielPk5ZKAau4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BP0O3GOZ4nqBAIx4tpoutsRuu0ny5SXaUu5dYQ3fBVlPSp79EVbPVCpQxFROW1NzDI4URf4ZqkFh5CYPSORnGmMszWCnv45Nzml9bLKxc9a1DeqEcHeetqjAauquOKctldPCEltxRaoSn5G/Jl8OPkLJOpOZxa3EYtv6qv+Ujmk= 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=Ccb8raXp; 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="Ccb8raXp" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-594285c6509so6123001e87.0 for ; Tue, 02 Dec 2025 00:26:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764663971; x=1765268771; 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=ehk/EozwE7/cxfYnvgp9ayPWLUem+ZdJVcEwqK4yNNQ=; b=Ccb8raXpuhL9RJDjqR3xxdeZS7AUsGtNV5wSCBlHMPFiCLbAh7O8+YLcaaJwcGdEzW ld0C3IRtdXQIJAw232Y0hlOdaNLyqGQh9kt+LvolnPocnX51uN1tAy5oTQQigP1+g3Jz DLRVbJXshxIRHcQpkTdSU7TjaIui+5CjO4cTMsMfr9lE3yslLlnXf7gjN3ZafEdl6LVy /NbfCkIMHM/wd2DkD0S0AhqZzw/fIxxwoH82TS1+1wFscVAKmyJMYDclHi7OgOtmA0ti kU6rT/NlxUwWbgYKfW5WWpiiELvQHoV5aKF/UGOQYmqEanOdSmD0AxAbXuU+9pB33ekF HCFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764663971; x=1765268771; 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=ehk/EozwE7/cxfYnvgp9ayPWLUem+ZdJVcEwqK4yNNQ=; b=nBMbCrCY98wFhXIzSmMKC90x6QJq3Y7SntEwZ3SxcKUfSnTll3/+fzLJD6F/MPngzA +bT9uj7zfsQ1PnEaa1um7f34Vrzw7xaMvhabN4BlvYw7YCvxJOf742+GzTiqdis5CqVk YIPd6z9+aB8inoqIbwZMQfpWxUkxO73LyG81mjYFXOQklxe4/6KW6I+c+YYf488aWzvi DFzNBXd4jm3Z/3hxFutf9NSftsI46LBcmm9jNZlQIgX66WORg6Q+SAEYnjIQhyejJ89z 3KuSuVnihD5YgcgVfaCy1Fu1W+4TpWtmov9G3zUzRizluxAY17ElqJ4/oEwDa8iWzDj2 mrNg== X-Forwarded-Encrypted: i=1; AJvYcCWHsxM2a1D7dDLHBEs04tvJsp47giohOjCedSMxzIPQw04oobbvVxgUSJ+RjwJHQHFnhnwCm7BaVU3omjg=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4IrtzOGGmxyBcMeAksiqf1O9xbmjWtu7lI/JA1iy3AdyA3OCU gN6Ha98w8c5cqacGwMBGB87e4BsOftBdukGqTVuuIoycHQFBHj5Vt29P X-Gm-Gg: ASbGnctqhOX09zAwuOp+e76uvOsxAEhPWsJm15ZmMVoKuEKWrObg9Us6DE2Vofq/BdX GAYsqOmSQZGcQJv9i1a3P013lnJY7b4ZZ+eUqRzi/kXSwMoZOKX7lSCSMe3Yi8qNabS40FskPul 3HN8KounifeMpxAkQWllTjbeXpbSE2aQ6laMCglxdFxF0i7ZZcUPfZEjTVV1eL8hIuXpQ8tzkNC zggykGuduZrpnZ0YibOksrBz50iIg1lbPbKJ4klOGYrHYmWTMKTd8dJKZreUg9XDFV9Jdeurogo dSbn1jUYlJwYZ1U7RGcy9dUMG8D7IBnyWbrP08o2oN3yrdQUs10e+ebAokM7CG1p72QYc0t7vuo xkdpxrFWR2J/Wv2qm44ibph5dH+p4RHeM0bvjoFyvTh6SUnifVgPkdrUutl9S9HeE41eNbwHSyF V8WlKB1HXHcn4S7qDTYhAtIyltZhq8QiQ+/Wwh2XrU/mLTtCXGjZT2/Jpy X-Google-Smtp-Source: AGHT+IGn2T85wokYidmksQDFSWwRuOXBrdA4VZkbxivgoRlutulXTcvFaDIsij4nNImXyquaI1JIEA== X-Received: by 2002:a05:6512:2244:b0:594:25e6:8a3a with SMTP id 2adb3069b0e04-596a3ebe2e3mr14705850e87.20.1764663971108; Tue, 02 Dec 2025 00:26:11 -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-596bf8b06bcsm4423727e87.25.2025.12.02.00.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 00:26:09 -0800 (PST) From: Marcus Folkesson Date: Tue, 02 Dec 2025 09:25:17 +0100 Subject: [PATCH RESEND v2 1/6] 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: 7bit Message-Id: <20251202-st7571-split-v2-1-1e537a09e92f@gmail.com> References: <20251202-st7571-split-v2-0-1e537a09e92f@gmail.com> In-Reply-To: <20251202-st7571-split-v2-0-1e537a09e92f@gmail.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Javier Martinez Canillas Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Marcus Folkesson X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6974; i=marcus.folkesson@gmail.com; h=from:subject:message-id; bh=pz5GhbAytN7MzkdHAjHi7UGCmM26Ce8ielPk5ZKAau4=; b=owEBbQKS/ZANAwAKAYiATm9ZXVIyAcsmYgBpLqKCjy/KEzcPiDjyL8MdZLNFm2fdUbSrHpZF1 wdt0OlkpO2JAjMEAAEKAB0WIQQFUaLotmy1TWTBLGWIgE5vWV1SMgUCaS6iggAKCRCIgE5vWV1S MutJD/wNJlCo3x33PsercGjfnIlt2DmZ5Xtj2KJ7l6xrQshjiqDURNUgX6Xd8iUr4Iw6ZAe2ytV 25GKrpqn1xmGCdbEMeydzIKJ6cODiEsgvDKR21aqd5DepDPtd63/xUT/v+TG5ebOc/fQMXXb7nF 9nC3m/f1zZ3dxm8JDkZ/pS5p0TBUQbMhtaFXw1kE/W7e9bkHjyK3Dd7kXf81AQscEQGonjq3Apo Xf14UMV7iZzvMd/hlempbkG5GZnSJoOR1UiZJbWeiZeAJIzEaotFH8+ttgYwNGbQiv6xTRDLotO RjcBfY35QK1NHvxDybn6igue0e58qA4A3WAS/q9708Lj14o+WJiv7AjmPE5/TuHqUOu92iCXe6/ DgImFcARNBokmQ3sYRdOj+wsOTxFjqTJ9TvL5VYF9tsLhRhradeMd3y3L04VRiDhN4vTCCMdmqt NoOPwINGS/VGZ7G3f+19tmQ2pQPCudYIJzFKNLhG/C0iY/Nws4kgsSY8knMt7ZncxHwxQP29ASx hDx8gmKDGiOr55k/Bc3ULPtcGjVNjii2hVvMFI60P0u+b7vYOhqW5DcihgsTC1lIulbCUKgRnlQ LSyhIYMRaftbniagMXYVVOoA0ZV5BtWb8Oin69Jc7v+fdBGi2ndGtuapvVkvNnNQ3RqkURDJBwj 94RqVahl3mktpUg== 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. 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/sitronix/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 { }; struct st7571_device { - struct drm_device dev; + struct drm_device drm; struct drm_plane primary_plane; struct drm_crtc crtc; @@ -166,9 +166,9 @@ struct st7571_device { u8 *row; }; -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); } static int st7571_regmap_write(void *context, const void *data, size_t count) @@ -467,7 +467,7 @@ static void st7571_primary_plane_helper_atomic_update(struct drm_plane *plane, struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state); struct drm_framebuffer *fb = plane_state->fb; struct drm_atomic_helper_damage_iter iter; - struct drm_device *dev = plane->dev; + struct drm_device *drm = plane->dev; struct drm_rect damage; struct st7571_device *st7571 = drm_to_st7571(plane->dev); int ret, idx; @@ -479,7 +479,7 @@ static void st7571_primary_plane_helper_atomic_update(struct drm_plane *plane, if (ret) return; - if (!drm_dev_enter(dev, &idx)) + if (!drm_dev_enter(drm, &idx)) goto out_drm_gem_fb_end_cpu_access; 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 *plane, struct drm_atomic_state *state) { - struct drm_device *dev = plane->dev; + struct drm_device *drm = plane->dev; struct st7571_device *st7571 = drm_to_st7571(plane->dev); int idx; - if (!drm_dev_enter(dev, &idx)) + if (!drm_dev_enter(drm, &idx)) return; st7571_fb_clear_screen(st7571); @@ -621,20 +621,20 @@ static struct drm_display_mode st7571_mode(struct st7571_device *st7571) static int st7571_mode_config_init(struct st7571_device *st7571) { - struct drm_device *dev = &st7571->dev; + struct drm_device *drm = &st7571->drm; const struct st7571_panel_constraints *constraints = &st7571->pdata->constraints; int ret; - ret = drmm_mode_config_init(dev); + ret = drmm_mode_config_init(drm); if (ret) return ret; - dev->mode_config.min_width = constraints->min_ncols; - dev->mode_config.min_height = constraints->min_nlines; - dev->mode_config.max_width = constraints->max_ncols; - dev->mode_config.max_height = constraints->max_nlines; - dev->mode_config.preferred_depth = 24; - dev->mode_config.funcs = &st7571_mode_config_funcs; + drm->mode_config.min_width = constraints->min_ncols; + drm->mode_config.min_height = constraints->min_nlines; + drm->mode_config.max_width = constraints->max_ncols; + drm->mode_config.max_height = constraints->max_nlines; + drm->mode_config.preferred_depth = 24; + drm->mode_config.funcs = &st7571_mode_config_funcs; return 0; } @@ -643,10 +643,10 @@ static int st7571_plane_init(struct st7571_device *st7571, const struct st7571_panel_format *pformat) { struct drm_plane *primary_plane = &st7571->primary_plane; - struct drm_device *dev = &st7571->dev; + struct drm_device *drm = &st7571->drm; int ret; - ret = drm_universal_plane_init(dev, primary_plane, 0, + ret = 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 *st7571) { struct drm_plane *primary_plane = &st7571->primary_plane; struct drm_crtc *crtc = &st7571->crtc; - struct drm_device *dev = &st7571->dev; + struct drm_device *drm = &st7571->drm; int ret; - ret = drm_crtc_init_with_planes(dev, crtc, primary_plane, NULL, + ret = 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 = &st7571->encoder; struct drm_crtc *crtc = &st7571->crtc; - struct drm_device *dev = &st7571->dev; + struct drm_device *drm = &st7571->drm; int ret; - ret = drm_encoder_init(dev, encoder, &st7571_encoder_funcs, DRM_MODE_ENCODER_NONE, NULL); + ret = drm_encoder_init(drm, encoder, &st7571_encoder_funcs, DRM_MODE_ENCODER_NONE, NULL); if (ret) return ret; @@ -700,10 +700,10 @@ static int st7571_connector_init(struct st7571_device *st7571) { struct drm_connector *connector = &st7571->connector; struct drm_encoder *encoder = &st7571->encoder; - struct drm_device *dev = &st7571->dev; + struct drm_device *drm = &st7571->drm; int ret; - ret = drm_connector_init(dev, connector, &st7571_connector_funcs, + ret = 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 *st7571) static int st7571_probe(struct i2c_client *client) { struct st7571_device *st7571; - struct drm_device *dev; + struct drm_device *drm; int ret; st7571 = devm_drm_dev_alloc(&client->dev, &st7571_driver, - struct st7571_device, dev); + struct st7571_device, drm); if (IS_ERR(st7571)) return PTR_ERR(st7571); - dev = &st7571->dev; + drm = &st7571->drm; st7571->client = client; i2c_set_clientdata(client, st7571); st7571->pdata = 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"); - drm_mode_config_reset(dev); + drm_mode_config_reset(drm); - ret = drm_dev_register(dev, 0); + ret = drm_dev_register(drm, 0); if (ret) return dev_err_probe(&client->dev, ret, "Failed to register DRM device\n"); - drm_client_setup(dev, NULL); + drm_client_setup(drm, NULL); return 0; } @@ -1025,7 +1025,7 @@ static void st7571_remove(struct i2c_client *client) { struct st7571_device *st7571 = i2c_get_clientdata(client); - drm_dev_unplug(&st7571->dev); + drm_dev_unplug(&st7571->drm); } static const struct st7571_panel_data st7567_config = { -- 2.51.2