From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 F3CED3203B0 for ; Mon, 17 Nov 2025 09:04:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763370265; cv=none; b=JzOuhDOcVLHywmz297naoCok4uA/BYDIL9sycPzKkd10eLPMCkHVvyZWHJoJXcKQKi5nLtFLk3vSvChAqrGxYR+8iIYZsz26C1Mqn6RgSsnPm9ipm2MfuUPSR3cUhAOrDRIp3mKvMlAm3GrWE0CfuVsgYxv21304rY91D5Q8LyM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763370265; c=relaxed/simple; bh=pz5GhbAytN7MzkdHAjHi7UGCmM26Ce8ielPk5ZKAau4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HXH9H6aE6cNER+5e9AEcgpn3qVvXCpg3kg5qPId0WqJpjF1ea4FYPHyMe/oMoUFywawJdnBz2dW9wDqZvJTQ54dKjxZufoH00bXTOwOO1vmZxlNGwOEHon0R6jos18XFLMpvtpd0w8TUrlar+fpCVwiOSDy2RdD3BPtHDpgJkSY= 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=jnIjnt/d; arc=none smtp.client-ip=209.85.167.54 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="jnIjnt/d" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5958187fa55so2909557e87.3 for ; Mon, 17 Nov 2025 01:04:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763370261; x=1763975061; 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=jnIjnt/drBtWoRApSJSkmwtJ0V3bLo+AL3Ue0Ex5rL9I2xMZXgfEaFd1ovgKMkFcxK lHYxIduNYY/+yJdWiurO9xUl8Ui5ClNY+2b8V3R47xEBe0UhakupvXAkg269ut/I2dck AEIz7eVVp7ZbxyfobldurcWVzR9SJiXIICE56NJBITW6EAYNTKiBa77P/L2/C7Nq+5AT 2u/zNPS+DVF85DKY4Ty2Di8RcGglwnvFOt4jUok+VfUgsdsRi6nIX6kcfF1qH/7sFpUb 0anAY3Qu9JwrmgEgEwnrsGVJUxLwE8Ib6xMxWc7MSCH7grTKezKv3KijTF8F0nCVN7lD qXzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763370261; x=1763975061; 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=xOhxegs3Fu+sIdmqUjLt4ndNvY51d1J9mCKx2QY9lDh9mHiWqBUVfBqImJvuDa7VXH 6M5Nj5+Qt+wzZjM44ruN3Io7ubnnKyAtyEIb8RIkxxLk+PXTeeAb5MG0yveBQtLA0OtE lOsW7+MAyC3wJD9wrSLesIvcHziBayzDjvnOI/s4sjeOrDOZUlBsrkWj1wyBC/0SgnMd +NQFI8Fo7ZU1mD9AgwWdwZW14odutmCMTPiznPrVSd7PFSeCBpL7oOllG34CLUmv0WZ1 bUGuhJ1SVfKgsk2RF1cOCzkEqEEG4LPDDfAV3Lc8lpETx6s+0svzspxKyvt5M1ahzRqn q1PA== X-Forwarded-Encrypted: i=1; AJvYcCXb3o0BJ55G0XKOl9qW8AXaQ5tF6kozRA/cP8VTZYEbH4cWANAyMcy6G8aUI2M39Qg9wwe6wqSI5feZYrc=@vger.kernel.org X-Gm-Message-State: AOJu0YxhNnhu5QuO/Thv+2+7qGYzzRf4at7DppNM2EKQeajbOaKjKjjs ihYyod1f7OZGKTbsneoAIRbb0lgiRsYL85BQsPsH/RhPyWoYEf/ht5H/ X-Gm-Gg: ASbGncsQkpU02cYN/o5hUirC926aT4Eswy9PTTvlHmEQcwkL8JwcuHQjfFg95V+Ctgq 8aaGQBGeN9MfzWIk1kS1Sfz5EJ/Y/k3qe5GH8jJCo+qXXCQ15vg1cavTOaFHbpfXeCR4Nbupmkq NcvipXEQCtNHejIxIgHio65QMnd29rEdNUZJGg08NZtylQVg+D4y50aLtt1qSVOTfqjxFrDZ4rk sHLv/zpr9cn9QyM21oK2WaV/bl/uuPlHO86P8nWshU1hvayw8iakgXxdRY+coS/Rfs4gvF/kbPQ xJDArrAQp15VUdls0PNZpMjxrGYGerRFC/3RshU41w/MHjW3HileST7vwDweGG/7rf1xFFvieuU DwDKG+X6bMam6Pvuo2yvuP8hVNQkNvJq1ovG1PowW7gPIshMYiByX4rkFYptTSIORx139ybQute 2JJSCscLRgUjRYLVscrUyOUKf+eWk+FaEzvaPnohch7I976jsMkTGNBlR2 X-Google-Smtp-Source: AGHT+IELavp6ALa1YIbZ9iay4QMBUdUiCg6KW3BGaizvP3d5EwN6VvQx/N2OqemVhxKmqvMnVf7Egw== X-Received: by 2002:a05:6512:4028:b0:595:7e73:995c with SMTP id 2adb3069b0e04-59584211dd2mr3226563e87.44.1763370260709; Mon, 17 Nov 2025 01:04:20 -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-595803b77e5sm2982498e87.42.2025.11.17.01.04.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 01:04:20 -0800 (PST) From: Marcus Folkesson Date: Mon, 17 Nov 2025 10:03:43 +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: <20251117-st7571-split-v2-1-13189da95265@gmail.com> References: <20251117-st7571-split-v2-0-13189da95265@gmail.com> In-Reply-To: <20251117-st7571-split-v2-0-13189da95265@gmail.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter 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/ZANAwAKAYiATm9ZXVIyAcsmYgBpGuT16ofEyQwFo6DFoJ2GjMlgrmMlBype2mZVg CQ2RuoQHWKJAjMEAAEKAB0WIQQFUaLotmy1TWTBLGWIgE5vWV1SMgUCaRrk9QAKCRCIgE5vWV1S MhkGEAC6egudrdBhe5XMqueXGEPy8m2csWu+L7Qu1YXtW8cz0rRSVDZJrXFFmQ7pfsecjCQRCrM 0gseoXJZ9dnimEIaSAMNklCZ5at2VbV1ji6ApUkwBnd8mgm/YAnQdPEtOUabHT0AWbUUfZNkgR2 TyuS+C3LUMohLpVJne5alAp9+JQzMXwrT2BzW/eLyYXO+UQA0vKV09yM25NtrEwXpbbmRfLZEKk sLhgSxiE8apt8ebFa4T25hszzBxqmYa40L6eHA47sLl8OgHldbvoSgldyv0eisRSBG3LnVbABEc k+JQ6JgSib3pnYP2+CEXRmLOOBMNxHp1fn9fESZboZofcHSSxe0kDvoUU4tfy9eu8bP5jUA+u7T H5J2frcr8KyDdWcgVlqelcq4Dp0QwnBe/QvJGqL7cWJmZBBMFG7u/viMvtABGaqlgjxgjDgm8jE qVAJ87Bs8PqvPLhy+DX8cITPdnLY8sTl4UqAIj3lWIDGUKbZG4f7JLBVn3sMSp7gbQ6Pkt7IWjI mQkhdKV0f11nt7SU1tU9thStryT3bHl2jZHw9QybTbXhn4C7RZVEEyon3ajRX47gSxied8h2n9j vLmz+B6Fz49iCrtJN2v9ClXFh/nYFL1D2UgGAnrtDWaVy2RuRwL2nq5G+uWlyba/tIOI4oBJ90+ ntpqe3467Hd6xvw== 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