From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A889254873 for ; Thu, 22 May 2025 09:22:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747905761; cv=none; b=Cl22tEgLAPYuXS6BVvh/uel7B1JGmmeEj6PbY3j4asUsA9CoZX5FXElorgMbzrUNj5uq9Tu7Wwo6T0YoqFI++wddAv1JCDKEh1YuKkOGXN2JY9qGp4/QbPX4Tyr1AwJpHVoTHg6UQJAUzSKP6/LVhCQu/Mz9FKSuO5qHJ78KO54= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747905761; c=relaxed/simple; bh=a80hXcGHLnEXqoaB3/i3Ak7XE5EBq2FHTMb5YZ4WKkU=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=V8zqpgyupKOhoFB2L+zdHesbMpKv0jxpXXU7SLqWvwM2BYsHqW3XasMQY+n9Nd0SKPRZ0ERyiEvdB6Lgqe2wiRzkIL5KNKxN+FTXuOAnAq2vce0VHmtliS30qBS7oKNgO0k35M+qJqfRLQQP/+yQs7DsN6mXp0u0EVCSqCF/Ask= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=frOgHyA1; arc=none smtp.client-ip=198.175.65.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="frOgHyA1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747905759; x=1779441759; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=a80hXcGHLnEXqoaB3/i3Ak7XE5EBq2FHTMb5YZ4WKkU=; b=frOgHyA16BZiq/UYUw3xxDdOcUDs7/JkW6M/zC4kF0nZHTi11J6wRrlI V3JYiru+aNZl2MIrFIN2POn/mvf5UTXyGipAPt5b4twouib+9bMKzRzSR L7vHu1DaM9497dU4/BleYZQ/fKtCm1mvGcbc8ExL5OMQEL6+ZzIcvvW2a vwd2qzpJIjvMWvVfkbQ12zcbrsZ5m3SOSaiipB+xx3H7MCiEDP8zMpFWw cueVdNMVdVdxytChv0NzvDCIIcG7xx6qss/roN3sKLf+CqYLXcNE45blF IJTAONcJp8dNN5OEQ3Q7yYKR5b0ZH0aiEWyPlQkkfGNBsX5t9MdnRW2WM A==; X-CSE-ConnectionGUID: xyQRhzV/Sauf+MltgqrrPA== X-CSE-MsgGUID: +b+yEFQBSp2CMPSRPaAwwQ== X-IronPort-AV: E=McAfee;i="6700,10204,11440"; a="72445573" X-IronPort-AV: E=Sophos;i="6.15,305,1739865600"; d="scan'208";a="72445573" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2025 02:22:39 -0700 X-CSE-ConnectionGUID: ZF/aOTzKS164tKbdKmjWZQ== X-CSE-MsgGUID: udRzaoqjTj25RI1WnsRiSQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,305,1739865600"; d="scan'208";a="145661444" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.245.112]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2025 02:22:33 -0700 From: Jani Nikula To: "Borah, Chaitanya Kumar" , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , "Hajda, Andrzej" , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Simona Vetter , Ville Syrjala Cc: Thomas Petazzoni , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" Subject: RE: [PATCH] drm/bridge: fix build with CONFIG_OF=n In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20250522-devm_drm_put_bridge-fix-non-of-build-v1-1-a05234dea046@bootlin.com> Date: Thu, 22 May 2025 12:22:30 +0300 Message-ID: <87zff5rodl.fsf@intel.com> 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 On Thu, 22 May 2025, "Borah, Chaitanya Kumar" wrote: >> -----Original Message----- >> From: dri-devel On Behalf Of L= uca >> Ceresoli >> Sent: Thursday, May 22, 2025 12:43 PM >> To: Maarten Lankhorst ; Maxime Ripard >> ; Thomas Zimmermann ; >> Hajda, Andrzej ; Neil Armstrong >> ; Robert Foss ; Laurent >> Pinchart ; Jonas Karlman >> ; Jernej Skrabec ; David >> Airlie ; Simona Vetter ; Ville Syrja= la >> >> Cc: Thomas Petazzoni ; dri- >> devel@lists.freedesktop.org; linux-kernel@vger.kernel.org; Luca Ceresoli >> >> Subject: [PATCH] drm/bridge: fix build with CONFIG_OF=3Dn >>=20 >> Commit 5164553d739e ("drm/bridge: add devm_drm_put_bridge()") adds >> two declarations for devm_drm_put_bridge(): >>=20 >> 1) an inline declaration in the #else branch of >> '#if defined(CONFIG_OF)...' >> 2) one outside of the same #if >>=20 >> This results in a build failure with CONFIG_OF=3Dn: >>=20 >> ../drivers/gpu/drm/drm_bridge.c:1406:6: error: redefinition of >> =E2=80=98devm_drm_put_bridge=E2=80=99 >>=20 >> The function has nothing to do with OF, thus fix by removing declaration= 1. > > LGTM. Fixes the build error. > > Tested-by: Chaitanya Kumar Borah > Reviewed-by: Chaitanya Kumar Borah Ditto. Please merge. BR, Jani. > > >>=20 >> Fixes: 5164553d739e ("drm/bridge: add devm_drm_put_bridge()") >> Reported-by: Ville Syrjala >> Closes: https://oftc.catirclogs.org/dri-devel/2025-05-21#34288266; >> Signed-off-by: Luca Ceresoli >> --- >> include/drm/drm_bridge.h | 2 -- >> 1 file changed, 2 deletions(-) >>=20 >> diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index >> 464da28f9134f0fcece5c72a8c5fe7f3e42c7e3d..0af5db244db8580ea0c9af1d9a >> 373b7bf62ee699 100644 >> --- a/include/drm/drm_bridge.h >> +++ b/include/drm/drm_bridge.h >> @@ -1311,8 +1311,6 @@ static inline struct drm_bridge >> *devm_drm_of_get_bridge(struct device *dev, >> return ERR_PTR(-ENODEV); >> } >>=20 >> -static inline void devm_drm_put_bridge(struct device *dev, struct >> drm_bridge *bridge) {} >> - >> static inline struct drm_bridge *drmm_of_get_bridge(struct drm_device >> *drm, >> struct device_node *node, >> u32 port, >>=20 >> --- >> base-commit: a3436f63aa4f93b043a970cc72a196a501191ecc >> change-id: 20250522-devm_drm_put_bridge-fix-non-of-build-fbb67d28494c >>=20 >> Best regards, >> -- >> Luca Ceresoli > --=20 Jani Nikula, Intel