From patchwork Tue Mar 19 08:00:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 13596356 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BCE27C54E68 for ; Tue, 19 Mar 2024 08:14:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3A77310F5A8; Tue, 19 Mar 2024 08:14:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="cygosqag"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="aKmoiVKx"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="cygosqag"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="aKmoiVKx"; dkim-atps=neutral Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 082B210F588 for ; Tue, 19 Mar 2024 08:14:37 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8A83737509; Tue, 19 Mar 2024 08:14:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710836075; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FdEsKJLj1QtTESpShlC38wb1jB9F/4NF6zzbrCLwBsc=; b=cygosqagq+YOXddyo7tYfilL5qsrSGEbd8sQbTbazgYxu+4gaXnniOnhjOucLZ5u5vHNfy X9gZNGv7H1RBqdJRXaL5q7wh6ev5fB1T9Bw3wsGQX8JbcCJDu2Y7pwETV9Rsgegr8hAb2B TOMuuKBK/BQb12/8kS9vjBAQkMTon34= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710836075; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FdEsKJLj1QtTESpShlC38wb1jB9F/4NF6zzbrCLwBsc=; b=aKmoiVKxDtTiEvg8zOPyaqXnhkRqmUvl1yOedAzrr7CXH4RZxr/u8f9ZnUlfjRQUW36kXk VWVdRyN0Rx6532CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710836075; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FdEsKJLj1QtTESpShlC38wb1jB9F/4NF6zzbrCLwBsc=; b=cygosqagq+YOXddyo7tYfilL5qsrSGEbd8sQbTbazgYxu+4gaXnniOnhjOucLZ5u5vHNfy X9gZNGv7H1RBqdJRXaL5q7wh6ev5fB1T9Bw3wsGQX8JbcCJDu2Y7pwETV9Rsgegr8hAb2B TOMuuKBK/BQb12/8kS9vjBAQkMTon34= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710836075; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FdEsKJLj1QtTESpShlC38wb1jB9F/4NF6zzbrCLwBsc=; b=aKmoiVKxDtTiEvg8zOPyaqXnhkRqmUvl1yOedAzrr7CXH4RZxr/u8f9ZnUlfjRQUW36kXk VWVdRyN0Rx6532CA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4B08D136D6; Tue, 19 Mar 2024 08:14:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id YLLNEGtJ+WWLeAAAD6G6ig (envelope-from ); Tue, 19 Mar 2024 08:14:35 +0000 From: Thomas Zimmermann To: airlied@redhat.com, jfalempe@redhat.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@gmail.com, daniel@ffwll.ch Cc: dri-devel@lists.freedesktop.org, Thomas Zimmermann Subject: [PATCH v4 06/12] drm/ast: Rename struct ast_i2c_chan to struct ast_ddc Date: Tue, 19 Mar 2024 09:00:26 +0100 Message-ID: <20240319081430.10165-7-tzimmermann@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240319081430.10165-1-tzimmermann@suse.de> References: <20240319081430.10165-1-tzimmermann@suse.de> MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [0.70 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCPT_COUNT_SEVEN(0.00)[8]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FREEMAIL_TO(0.00)[redhat.com,linux.intel.com,kernel.org,gmail.com,ffwll.ch]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The struct struct ast_i2c_chan represents the Display Data Channel (DDC); I2C is the underlying bus. Rename the structure, the variables and the helper ast_i2c_create() to ddc-like terms. No functional changes. Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/ast/ast_ddc.c | 71 ++++++++++++++++++---------------- drivers/gpu/drm/ast/ast_ddc.h | 4 +- drivers/gpu/drm/ast/ast_mode.c | 24 ++++++------ 3 files changed, 52 insertions(+), 47 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_ddc.c b/drivers/gpu/drm/ast/ast_ddc.c index df604b4e9673c..c0e5d03c028d8 100644 --- a/drivers/gpu/drm/ast/ast_ddc.c +++ b/drivers/gpu/drm/ast/ast_ddc.c @@ -29,8 +29,8 @@ static void ast_i2c_setsda(void *i2c_priv, int data) { - struct ast_i2c_chan *i2c = i2c_priv; - struct ast_device *ast = to_ast_device(i2c->dev); + struct ast_ddc *ddc = i2c_priv; + struct ast_device *ast = to_ast_device(ddc->dev); int i; u8 ujcrb7, jtemp; @@ -45,8 +45,8 @@ static void ast_i2c_setsda(void *i2c_priv, int data) static void ast_i2c_setscl(void *i2c_priv, int clock) { - struct ast_i2c_chan *i2c = i2c_priv; - struct ast_device *ast = to_ast_device(i2c->dev); + struct ast_ddc *ddc = i2c_priv; + struct ast_device *ast = to_ast_device(ddc->dev); int i; u8 ujcrb7, jtemp; @@ -61,8 +61,8 @@ static void ast_i2c_setscl(void *i2c_priv, int clock) static int ast_i2c_getsda(void *i2c_priv) { - struct ast_i2c_chan *i2c = i2c_priv; - struct ast_device *ast = to_ast_device(i2c->dev); + struct ast_ddc *ddc = i2c_priv; + struct ast_device *ast = to_ast_device(ddc->dev); uint32_t val, val2, count, pass; count = 0; @@ -83,8 +83,8 @@ static int ast_i2c_getsda(void *i2c_priv) static int ast_i2c_getscl(void *i2c_priv) { - struct ast_i2c_chan *i2c = i2c_priv; - struct ast_device *ast = to_ast_device(i2c->dev); + struct ast_ddc *ddc = i2c_priv; + struct ast_device *ast = to_ast_device(ddc->dev); uint32_t val, val2, count, pass; count = 0; @@ -103,45 +103,50 @@ static int ast_i2c_getscl(void *i2c_priv) return val & 1 ? 1 : 0; } -static void ast_i2c_release(struct drm_device *dev, void *res) +static void ast_ddc_release(struct drm_device *dev, void *res) { - struct ast_i2c_chan *i2c = res; + struct ast_ddc *ddc = res; - i2c_del_adapter(&i2c->adapter); + i2c_del_adapter(&ddc->adapter); } -struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev) +struct ast_ddc *ast_ddc_create(struct drm_device *dev) { - struct ast_i2c_chan *i2c; + struct ast_ddc *ddc; + struct i2c_adapter *adapter; + struct i2c_algo_bit_data *bit; int ret; - i2c = drmm_kzalloc(dev->dev, sizeof(*i2c), GFP_KERNEL); - if (!i2c) + ddc = drmm_kzalloc(dev, sizeof(*ddc), GFP_KERNEL); + if (!ddc) return ERR_PTR(-ENOMEM); - - i2c->adapter.owner = THIS_MODULE; - i2c->adapter.dev.parent = dev->dev; - i2c->dev = dev; - i2c_set_adapdata(&i2c->adapter, i2c); - snprintf(i2c->adapter.name, sizeof(i2c->adapter.name), "AST DDC bus"); - i2c->adapter.algo_data = &i2c->bit; - - i2c->bit.udelay = 20; - i2c->bit.timeout = 2; - i2c->bit.data = i2c; - i2c->bit.setsda = ast_i2c_setsda; - i2c->bit.setscl = ast_i2c_setscl; - i2c->bit.getsda = ast_i2c_getsda; - i2c->bit.getscl = ast_i2c_getscl; - ret = i2c_bit_add_bus(&i2c->adapter); + ddc->dev = dev; + + adapter = &ddc->adapter; + adapter->owner = THIS_MODULE; + adapter->dev.parent = dev->dev; + i2c_set_adapdata(adapter, ddc); + snprintf(adapter->name, sizeof(adapter->name), "AST DDC bus"); + + bit = &ddc->bit; + bit->udelay = 20; + bit->timeout = 2; + bit->data = ddc; + bit->setsda = ast_i2c_setsda; + bit->setscl = ast_i2c_setscl; + bit->getsda = ast_i2c_getsda; + bit->getscl = ast_i2c_getscl; + + adapter->algo_data = bit; + ret = i2c_bit_add_bus(adapter); if (ret) { drm_err(dev, "Failed to register bit i2c\n"); return ERR_PTR(ret); } - ret = drmm_add_action_or_reset(dev, ast_i2c_release, i2c); + ret = drmm_add_action_or_reset(dev, ast_ddc_release, ddc); if (ret) return ERR_PTR(ret); - return i2c; + return ddc; } diff --git a/drivers/gpu/drm/ast/ast_ddc.h b/drivers/gpu/drm/ast/ast_ddc.h index 244666fd6c530..071f9be3e27de 100644 --- a/drivers/gpu/drm/ast/ast_ddc.h +++ b/drivers/gpu/drm/ast/ast_ddc.h @@ -8,12 +8,12 @@ struct drm_device; -struct ast_i2c_chan { +struct ast_ddc { struct i2c_adapter adapter; struct drm_device *dev; struct i2c_algo_bit_data bit; }; -struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev); +struct ast_ddc *ast_ddc_create(struct drm_device *dev); #endif diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index bdef2160726e6..40cb495acc908 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -1388,18 +1388,18 @@ static const struct drm_connector_funcs ast_vga_connector_funcs = { static int ast_vga_connector_init(struct drm_device *dev, struct drm_connector *connector) { - struct ast_i2c_chan *i2c; + struct ast_ddc *ddc; int ret; - i2c = ast_i2c_create(dev); - if (IS_ERR(i2c)) { - ret = PTR_ERR(i2c); - drm_err(dev, "failed to add ddc bus for connector; ret=%d\n", ret); + ddc = ast_ddc_create(dev); + if (IS_ERR(ddc)) { + ret = PTR_ERR(ddc); + drm_err(dev, "failed to add DDC bus for connector; ret=%d\n", ret); return ret; } ret = drm_connector_init_with_ddc(dev, connector, &ast_vga_connector_funcs, - DRM_MODE_CONNECTOR_VGA, &i2c->adapter); + DRM_MODE_CONNECTOR_VGA, &ddc->adapter); if (ret) return ret; @@ -1485,18 +1485,18 @@ static const struct drm_connector_funcs ast_sil164_connector_funcs = { static int ast_sil164_connector_init(struct drm_device *dev, struct drm_connector *connector) { - struct ast_i2c_chan *i2c; + struct ast_ddc *ddc; int ret; - i2c = ast_i2c_create(dev); - if (IS_ERR(i2c)) { - ret = PTR_ERR(i2c); - drm_err(dev, "failed to add ddc bus for connector; ret=%d\n", ret); + ddc = ast_ddc_create(dev); + if (IS_ERR(ddc)) { + ret = PTR_ERR(ddc); + drm_err(dev, "failed to add DDC bus for connector; ret=%d\n", ret); return ret; } ret = drm_connector_init_with_ddc(dev, connector, &ast_sil164_connector_funcs, - DRM_MODE_CONNECTOR_DVII, &i2c->adapter); + DRM_MODE_CONNECTOR_DVII, &ddc->adapter); if (ret) return ret;