From nobody Tue Dec 2 00:04:07 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 88737274B59 for ; Tue, 25 Nov 2025 19:38:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764099535; cv=none; b=apNuK1f83FRB+rYLslWaj2Xt6rVS5UbSKrSDem72qSNApAcJ/nHcy4EW+3b/qkmssJDqGqXwKpmkixrY+t9lIlT7JAjHyKpKKIdshvz7zbbNEcshE/Sc5z/EG7Io6b+dnnKgwzyyVWj9vbHwwc5j98YAMClIDyiJSqFdlEKHPmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764099535; c=relaxed/simple; bh=XN0ZT6XwzvUPIIkhkK0XxyqngaoiJzs9X3DUQMHMN2w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=isRf2LUK5bC46zQSCOjAhUALtQ9+1Pj8MJQoH1aJuz/i2MlGlOzXoLo7kTsKGFc3pJ1JyHGASBSJ7q4KoRR28vhaGnt8puMma0fJ1ifh56rdT8WTegFnX5XYTAp3xyy52/3BNBwk2nnN9HWPk1aAEUhlqNo/WBKq0p/m/FURQ3A= 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=Zn5Mm/ei; arc=none smtp.client-ip=209.85.128.45 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="Zn5Mm/ei" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-477632d9326so35680485e9.1 for ; Tue, 25 Nov 2025 11:38:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764099531; x=1764704331; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HhdvsOVj27n/3OX2Xubld0LZbS4jqGYO9b78eyJdYWM=; b=Zn5Mm/eieL2O3amibRFrZRLro2J0G7ekUENzEwgF3XGAU7HW2B6BihQIloiECBfPJI KmGzXJ/ODa90AlQf6Z5/wy/4pkhSfMpJKnwdS/kDJn16R/CnKi7v7bV2KztVbfnMUKdW Omw2HPIwrt54ur+/LVOkiEfM8g6yGS8q4wt/c/iYy9xaM5HdGFwYR1xIotEiKOotGshW EoKR1iMKPS6LAPoO5M8x6esLc8/TVlrx0aI8SWc02GKykyiVjx/HGBimbsqYcs6O6W/5 hrjzWhplyYUfebXgV6eRzw5NaIaPrp6B0ooFfMJw52/aLK9fBL+rUTUE0qYucgxrylgk XeCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764099531; x=1764704331; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=HhdvsOVj27n/3OX2Xubld0LZbS4jqGYO9b78eyJdYWM=; b=D1IhkVFF/JH5GYB95ZG+Bx5tcoCQgbcSGt7pskQ0QR1GmKv/gSOqNLpQmWAEwCmGoI eXwNgGYGWUM68Od0F33UJ3REgvX7Ioj1DvisorHWjCNgJ+DH/5gPm8pnKXfgFgTPsjAQ 1y7af6VhF7HlRXO1ECXEF+7orH0UGCIRJBGADq0VbBmSSaEFmlBYghJEG81Ry8MfEJ/S 8abbKoHapJbolEEEvx0F6neHlHL1RC034HOTbZhV8Nkkf8PqBtqQ0SLGWUQNO1HWzuED n5G1EhVUfJEUQ9AxI3mhcKH1CQUK1+ZsnrijXjNoxn/s+nB6f8EQ5TjeP6/TGRFVeqGV v58Q== X-Forwarded-Encrypted: i=1; AJvYcCWGrg68kz+mZSccSGCJH3f5hw3kwSbBrWjigTcJ+9vcIw/NrrAcAa4VuGiFeir44mBO4Rhx+gDNrNBljTU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/6M6+LcIhqOsUuI/pSYdsGkTNA6j/HBe8OPR0pYVssVUZCjuY cIWbhywhX0CWTdCjUVylk1ey1MvAp9lJGt4jiVu6fkHzIfznSyK3i1Ep X-Gm-Gg: ASbGncvo7yWetygm2DD6nguq+jLduFYETJI94TN45nDnxqgvyqkx+cttyzcyf3U5+/2 sMEFbNFuOwiciEVrZ2KMfznyOwRucpfFmi/5c7Pflw2nOr1zskulyAe5W5YqEWiGUSogG3rxlSE qX7bZMwla15MsrzvbPIY9afmvPvJGV9XbxyU3gAec+WB5roXfLZ4vjKUMea/VwgH7w1SmO2mhfs z5LLHWvmB7jg35VHdu1iO6z5bqaN8En3xqJsp82ENuAwKiIPbvXzASVacGUfg8ZL5UoaVpWbkMg NAlcpzAOUxQJwJbsZj7JNvWm2CVOpxowVjpSDei+lGFiYlH9J6dREmuxha2ImfZBZF6sP7qtKfG Om3DEy3sYiPOhLLhygIw/Pn4f6HpkQJaHzMzbcnxTH8dcE6USs5Ipn5q5UYzBrgwVpBKIXaNklI U5Pn2+D6pEeoL8M4vReDz3FbINu83mfg== X-Google-Smtp-Source: AGHT+IEbIDsEt1+Gf5EHUaxUFKp2foy/z/YAHyHLKb3QMfpKucpSc5d777Hh0Tsc642j+bwxsjXtPg== X-Received: by 2002:a5d:5d08:0:b0:429:cd3f:f43b with SMTP id ffacd0b85a97d-42cc1ac9c81mr17324919f8f.4.1764099530351; Tue, 25 Nov 2025 11:38:50 -0800 (PST) Received: from ekhafagy-ROG-Strix.. ([41.34.101.194]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7f2e556sm35792375f8f.5.2025.11.25.11.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 11:38:48 -0800 (PST) From: Eslam Khafagy To: =linus.walleij@linaro.org, =maarten.lankhorst@linux.intel.com, =mripard@kernel.org, =tzimmermann@suse.de, =airlied@gmail.com, =simona@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eslam Khafagy Subject: [PATCH v2] drm: pl111: replace dev_* print functions with drm_* variants Date: Tue, 25 Nov 2025 21:38:45 +0200 Message-ID: <20251125193845.425416-1-eslam.medhat1993@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update the PL111 CLCD driver to use DRM print macros drm_*() instead of dev_*(). This change ensures consistency with DRM subsystem logging conventions [1]. [1] Link: https://docs.kernel.org/gpu/todo.html#convert-logging-to-drm-function= s-with-drm-device-parameter Signed-off-by: Eslam Khafagy --- v2: * Add mssing include file drm/drm_print.h v1: https://lore.kernel.org/all/20251122004951.567753-1-eslam.medhat1993@gm= ail.com/ --- drivers/gpu/drm/pl111/pl111_display.c | 4 +- drivers/gpu/drm/pl111/pl111_drv.c | 29 +++++++------- drivers/gpu/drm/pl111/pl111_nomadik.c | 4 +- drivers/gpu/drm/pl111/pl111_nomadik.h | 4 +- drivers/gpu/drm/pl111/pl111_versatile.c | 53 +++++++++++++------------ drivers/gpu/drm/pl111/pl111_versatile.h | 2 +- 6 files changed, 49 insertions(+), 47 deletions(-) diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/= pl111_display.c index 3a9661b9b1fc..5d10bc5fdf1f 100644 --- a/drivers/gpu/drm/pl111/pl111_display.c +++ b/drivers/gpu/drm/pl111/pl111_display.c @@ -138,7 +138,7 @@ static void pl111_display_enable(struct drm_simple_disp= lay_pipe *pipe, =20 ret =3D clk_set_rate(priv->clk, mode->clock * 1000); if (ret) { - dev_err(drm->dev, + drm_err(drm, "Failed to set pixel clock rate to %d: %d\n", mode->clock * 1000, ret); } @@ -553,7 +553,7 @@ pl111_init_clock_divider(struct drm_device *drm) int ret; =20 if (IS_ERR(parent)) { - dev_err(drm->dev, "CLCD: unable to get clcdclk.\n"); + drm_err(drm, "CLCD: unable to get clcdclk.\n"); return PTR_ERR(parent); } =20 diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl11= 1_drv.c index 56ff6a3fb483..ac9e4b6bd2eb 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include =20 @@ -98,7 +99,7 @@ static int pl111_modeset_init(struct drm_device *dev) struct drm_panel *tmp_panel; struct drm_bridge *tmp_bridge; =20 - dev_dbg(dev->dev, "checking endpoint %d\n", i); + drm_dbg(dev, "checking endpoint %d\n", i); =20 ret =3D drm_of_find_panel_or_bridge(dev->dev->of_node, 0, i, @@ -114,18 +115,18 @@ static int pl111_modeset_init(struct drm_device *dev) defer =3D true; } else if (ret !=3D -ENODEV) { /* Continue, maybe something else is working */ - dev_err(dev->dev, + drm_err(dev, "endpoint %d returns %d\n", i, ret); } } =20 if (tmp_panel) { - dev_info(dev->dev, + drm_info(dev, "found panel on endpoint %d\n", i); panel =3D tmp_panel; } if (tmp_bridge) { - dev_info(dev->dev, + drm_info(dev, "found bridge on endpoint %d\n", i); bridge =3D tmp_bridge; } @@ -149,9 +150,9 @@ static int pl111_modeset_init(struct drm_device *dev) goto finish; } } else if (bridge) { - dev_info(dev->dev, "Using non-panel bridge\n"); + drm_info(dev, "Using non-panel bridge\n"); } else { - dev_err(dev->dev, "No bridge, exiting\n"); + drm_err(dev, "No bridge, exiting\n"); return -ENODEV; } =20 @@ -163,7 +164,7 @@ static int pl111_modeset_init(struct drm_device *dev) =20 ret =3D pl111_display_init(dev); if (ret !=3D 0) { - dev_err(dev->dev, "Failed to init display\n"); + drm_err(dev, "Failed to init display\n"); goto out_bridge; } =20 @@ -175,7 +176,7 @@ static int pl111_modeset_init(struct drm_device *dev) if (!priv->variant->broken_vblank) { ret =3D drm_vblank_init(dev, 1); if (ret !=3D 0) { - dev_err(dev->dev, "Failed to init vblank\n"); + drm_err(dev, "Failed to init vblank\n"); goto out_bridge; } } @@ -255,13 +256,13 @@ static int pl111_amba_probe(struct amba_device *amba_= dev, =20 ret =3D of_reserved_mem_device_init(dev); if (!ret) { - dev_info(dev, "using device-specific reserved memory\n"); + drm_info(drm, "using device-specific reserved memory\n"); priv->use_device_memory =3D true; } =20 if (of_property_read_u32(dev->of_node, "max-memory-bandwidth", &priv->memory_bw)) { - dev_info(dev, "no max memory bandwidth specified, assume unlimited\n"); + drm_info(drm, "no max memory bandwidth specified, assume unlimited\n"); priv->memory_bw =3D 0; } =20 @@ -276,17 +277,17 @@ static int pl111_amba_probe(struct amba_device *amba_= dev, =20 priv->regs =3D devm_ioremap_resource(dev, &amba_dev->res); if (IS_ERR(priv->regs)) { - dev_err(dev, "%s failed mmio\n", __func__); + drm_err(drm, "%s failed mmio\n", __func__); ret =3D PTR_ERR(priv->regs); goto dev_put; } =20 /* This may override some variant settings */ - ret =3D pl111_versatile_init(dev, priv); + ret =3D pl111_versatile_init(drm, priv); if (ret) goto dev_put; =20 - pl111_nomadik_init(dev); + pl111_nomadik_init(drm); =20 /* turn off interrupts before requesting the irq */ writel(0, priv->regs + priv->ienb); @@ -294,7 +295,7 @@ static int pl111_amba_probe(struct amba_device *amba_de= v, ret =3D devm_request_irq(dev, amba_dev->irq[0], pl111_irq, 0, variant->name, priv); if (ret !=3D 0) { - dev_err(dev, "%s failed irq %d\n", __func__, ret); + drm_err(drm, "%s failed irq %d\n", __func__, ret); return ret; } =20 diff --git a/drivers/gpu/drm/pl111/pl111_nomadik.c b/drivers/gpu/drm/pl111/= pl111_nomadik.c index 6f385e59be22..f3218d59c5f1 100644 --- a/drivers/gpu/drm/pl111/pl111_nomadik.c +++ b/drivers/gpu/drm/pl111/pl111_nomadik.c @@ -9,7 +9,7 @@ #define PMU_CTRL_OFFSET 0x0000 #define PMU_CTRL_LCDNDIF BIT(26) =20 -void pl111_nomadik_init(struct device *dev) +void pl111_nomadik_init(struct drm_device *dev) { struct regmap *pmu_regmap; =20 @@ -31,6 +31,6 @@ void pl111_nomadik_init(struct device *dev) PMU_CTRL_OFFSET, PMU_CTRL_LCDNDIF, 0); - dev_info(dev, "set Nomadik PMU mux to CLCD mode\n"); + drm_info(dev, "set Nomadik PMU mux to CLCD mode\n"); } EXPORT_SYMBOL_GPL(pl111_nomadik_init); diff --git a/drivers/gpu/drm/pl111/pl111_nomadik.h b/drivers/gpu/drm/pl111/= pl111_nomadik.h index 47ccf5c839fc..b2c9f7cc1c8c 100644 --- a/drivers/gpu/drm/pl111/pl111_nomadik.h +++ b/drivers/gpu/drm/pl111/pl111_nomadik.h @@ -8,11 +8,11 @@ struct device; =20 #ifdef CONFIG_ARCH_NOMADIK =20 -void pl111_nomadik_init(struct device *dev); +void pl111_nomadik_init(struct drm_device *dev); =20 #else =20 -static inline void pl111_nomadik_init(struct device *dev) +static inline void pl111_nomadik_init(struct drm_device *dev) { } =20 diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl11= 1/pl111_versatile.c index 5f460b296c0c..0d8331a3909f 100644 --- a/drivers/gpu/drm/pl111/pl111_versatile.c +++ b/drivers/gpu/drm/pl111/pl111_versatile.c @@ -20,6 +20,7 @@ #include =20 #include +#include =20 #include "pl111_versatile.h" #include "pl111_drm.h" @@ -116,7 +117,7 @@ static void pl111_integrator_enable(struct drm_device *= drm, u32 format) { u32 val; =20 - dev_info(drm->dev, "enable Integrator CLCD connectors\n"); + drm_info(drm, "enable Integrator CLCD connectors\n"); =20 /* FIXME: really needed? */ val =3D INTEGRATOR_CLCD_LCD_STATIC1 | INTEGRATOR_CLCD_LCD_STATIC2 | @@ -134,7 +135,7 @@ static void pl111_integrator_enable(struct drm_device *= drm, u32 format) val |=3D INTEGRATOR_CLCD_LCDMUX_VGA555; break; default: - dev_err(drm->dev, "unhandled format on Integrator 0x%08x\n", + drm_err(drm, "unhandled format on Integrator 0x%08x\n", format); break; } @@ -156,7 +157,7 @@ static void pl111_impd1_enable(struct drm_device *drm, = u32 format) { u32 val; =20 - dev_info(drm->dev, "enable IM-PD1 CLCD connectors\n"); + drm_info(drm, "enable IM-PD1 CLCD connectors\n"); val =3D IMPD1_CTRL_DISP_VGA | IMPD1_CTRL_DISP_ENABLE; =20 regmap_update_bits(versatile_syscon_map, @@ -167,7 +168,7 @@ static void pl111_impd1_enable(struct drm_device *drm, = u32 format) =20 static void pl111_impd1_disable(struct drm_device *drm) { - dev_info(drm->dev, "disable IM-PD1 CLCD connectors\n"); + drm_info(drm, "disable IM-PD1 CLCD connectors\n"); =20 regmap_update_bits(versatile_syscon_map, IMPD1_CTRL_OFFSET, @@ -194,7 +195,7 @@ static void pl111_impd1_disable(struct drm_device *drm) =20 static void pl111_versatile_disable(struct drm_device *drm) { - dev_info(drm->dev, "disable Versatile CLCD connectors\n"); + drm_info(drm, "disable Versatile CLCD connectors\n"); regmap_update_bits(versatile_syscon_map, SYS_CLCD, SYS_CLCD_CONNECTOR_MASK, @@ -205,7 +206,7 @@ static void pl111_versatile_enable(struct drm_device *d= rm, u32 format) { u32 val =3D 0; =20 - dev_info(drm->dev, "enable Versatile CLCD connectors\n"); + drm_info(drm, "enable Versatile CLCD connectors\n"); =20 switch (format) { case DRM_FORMAT_ABGR8888: @@ -227,7 +228,7 @@ static void pl111_versatile_enable(struct drm_device *d= rm, u32 format) val |=3D SYS_CLCD_MODE_5551; break; default: - dev_err(drm->dev, "unhandled format on Versatile 0x%08x\n", + drm_err(drm, "unhandled format on Versatile 0x%08x\n", format); break; } @@ -247,7 +248,7 @@ static void pl111_versatile_enable(struct drm_device *d= rm, u32 format) =20 static void pl111_realview_clcd_disable(struct drm_device *drm) { - dev_info(drm->dev, "disable RealView CLCD connectors\n"); + drm_info(drm, "disable RealView CLCD connectors\n"); regmap_update_bits(versatile_syscon_map, SYS_CLCD, SYS_CLCD_CONNECTOR_MASK, @@ -256,7 +257,7 @@ static void pl111_realview_clcd_disable(struct drm_devi= ce *drm) =20 static void pl111_realview_clcd_enable(struct drm_device *drm, u32 format) { - dev_info(drm->dev, "enable RealView CLCD connectors\n"); + drm_info(drm, "enable RealView CLCD connectors\n"); regmap_update_bits(versatile_syscon_map, SYS_CLCD, SYS_CLCD_CONNECTOR_MASK, @@ -376,7 +377,7 @@ static const struct pl111_variant_data pl111_vexpress = =3D { #define VEXPRESS_FPGAMUX_DAUGHTERBOARD_1 0x01 #define VEXPRESS_FPGAMUX_DAUGHTERBOARD_2 0x02 =20 -static int pl111_vexpress_clcd_init(struct device *dev, struct device_node= *np, +static int pl111_vexpress_clcd_init(struct drm_device *dev, struct device_= node *np, struct pl111_drm_dev_private *priv) { struct platform_device *pdev; @@ -433,22 +434,22 @@ static int pl111_vexpress_clcd_init(struct device *de= v, struct device_node *np, mux_motherboard =3D false; =20 if (mux_motherboard) { - dev_info(dev, "DVI muxed to motherboard CLCD\n"); + drm_info(dev, "DVI muxed to motherboard CLCD\n"); val =3D VEXPRESS_FPGAMUX_MOTHERBOARD; - } else if (ct_clcd =3D=3D dev->of_node) { - dev_info(dev, + } else if (ct_clcd =3D=3D dev->dev->of_node) { + drm_info(dev, "DVI muxed to daughterboard 1 (core tile) CLCD\n"); val =3D VEXPRESS_FPGAMUX_DAUGHTERBOARD_1; } else { - dev_info(dev, "core tile graphics present\n"); - dev_info(dev, "this device will be deactivated\n"); + drm_info(dev, "core tile graphics present\n"); + drm_info(dev, "this device will be deactivated\n"); return -ENODEV; } =20 /* Call into deep Vexpress configuration API */ pdev =3D of_find_device_by_node(np); if (!pdev) { - dev_err(dev, "can't find the sysreg device, deferring\n"); + drm_err(dev, "can't find the sysreg device, deferring\n"); return -EPROBE_DEFER; } =20 @@ -461,17 +462,17 @@ static int pl111_vexpress_clcd_init(struct device *de= v, struct device_node *np, ret =3D regmap_write(map, 0, val); platform_device_put(pdev); if (ret) { - dev_err(dev, "error setting DVI muxmode\n"); + drm_err(dev, "error setting DVI muxmode\n"); return -ENODEV; } =20 priv->variant =3D &pl111_vexpress; - dev_info(dev, "initializing Versatile Express PL111\n"); + drm_info(dev, "initializing Versatile Express PL111\n"); =20 return 0; } =20 -int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private = *priv) +int pl111_versatile_init(struct drm_device *dev, struct pl111_drm_dev_priv= ate *priv) { const struct of_device_id *clcd_id; enum versatile_clcd versatile_clcd_type; @@ -492,7 +493,7 @@ int pl111_versatile_init(struct device *dev, struct pl1= 11_drm_dev_private *priv) int ret =3D pl111_vexpress_clcd_init(dev, np, priv); of_node_put(np); if (ret) - dev_err(dev, "Versatile Express init failed - %d", ret); + drm_err(dev, "Versatile Express init failed - %d", ret); return ret; } =20 @@ -511,7 +512,7 @@ int pl111_versatile_init(struct device *dev, struct pl1= 11_drm_dev_private *priv) map =3D syscon_node_to_regmap(np); of_node_put(np); if (IS_ERR(map)) { - dev_err(dev, "no Versatile syscon regmap\n"); + drm_err(dev, "no Versatile syscon regmap\n"); return PTR_ERR(map); } =20 @@ -520,14 +521,14 @@ int pl111_versatile_init(struct device *dev, struct p= l111_drm_dev_private *priv) versatile_syscon_map =3D map; priv->variant =3D &pl110_integrator; priv->variant_display_enable =3D pl111_integrator_enable; - dev_info(dev, "set up callbacks for Integrator PL110\n"); + drm_info(dev, "set up callbacks for Integrator PL110\n"); break; case INTEGRATOR_IMPD1: versatile_syscon_map =3D map; priv->variant =3D &pl110_impd1; priv->variant_display_enable =3D pl111_impd1_enable; priv->variant_display_disable =3D pl111_impd1_disable; - dev_info(dev, "set up callbacks for IM-PD1 PL110\n"); + drm_info(dev, "set up callbacks for IM-PD1 PL110\n"); break; case VERSATILE_CLCD: versatile_syscon_map =3D map; @@ -542,7 +543,7 @@ int pl111_versatile_init(struct device *dev, struct pl1= 11_drm_dev_private *priv) */ priv->ienb =3D CLCD_PL111_IENB; priv->ctrl =3D CLCD_PL111_CNTL; - dev_info(dev, "set up callbacks for Versatile PL110\n"); + drm_info(dev, "set up callbacks for Versatile PL110\n"); break; case REALVIEW_CLCD_EB: case REALVIEW_CLCD_PB1176: @@ -553,10 +554,10 @@ int pl111_versatile_init(struct device *dev, struct p= l111_drm_dev_private *priv) priv->variant =3D &pl111_realview; priv->variant_display_enable =3D pl111_realview_clcd_enable; priv->variant_display_disable =3D pl111_realview_clcd_disable; - dev_info(dev, "set up callbacks for RealView PL111\n"); + drm_info(dev, "set up callbacks for RealView PL111\n"); break; default: - dev_info(dev, "unknown Versatile system controller\n"); + drm_info(dev, "unknown Versatile system controller\n"); break; } =20 diff --git a/drivers/gpu/drm/pl111/pl111_versatile.h b/drivers/gpu/drm/pl11= 1/pl111_versatile.h index 143877010042..7a15c5f7efe8 100644 --- a/drivers/gpu/drm/pl111/pl111_versatile.h +++ b/drivers/gpu/drm/pl111/pl111_versatile.h @@ -7,6 +7,6 @@ struct device; struct pl111_drm_dev_private; =20 -int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private = *priv); +int pl111_versatile_init(struct drm_device *dev, struct pl111_drm_dev_priv= ate *priv); =20 #endif --=20 2.43.0