From nobody Thu Dec 18 23:46:25 2025 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (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 82AE712DDA2 for ; Wed, 1 May 2024 13:08:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714568897; cv=none; b=WtQldyhkFGRDPX95Fwpy3j16E18AX9Bt63xtfCu5C2OifRFMJQta6n6PyHfs/2UDZCo9zzBqG2MxTT89M0Ce7lApD/FmAg10820H3BycI2+wCXoVcwmyT0n6Oj/nwGD9HpCgo39jeowGD2+SPx4Y0cptuthSs3V9d+8eyVKijzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714568897; c=relaxed/simple; bh=gc/o9u8NzZx22ClHEHIcXqgu1FhcRGTyvSqOBDjqUBQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=okBgvqpjUUXDB9ESfOvP39AcykToi8WrGs8j4nMgmQUqGaNEcG+3qCPqFqL+8cGCh0189wwthXR3R8PKIdOHiKsApYSmfDUGfd9KcVXzemjhVgPB1btm0mX7v4yiWEXNJTOn7Pzn6Ci7ooCNczpxmiRkoWBLkL5G8SdmXe+Che8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=akejBctd; arc=none smtp.client-ip=209.85.222.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="akejBctd" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-790c36dcee9so333737285a.2 for ; Wed, 01 May 2024 06:08:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1714568894; x=1715173694; 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=t4YWfk8RHGxp4UPGDejpf4mUjri4mE+IBxPLABnVZ8s=; b=akejBctd/CkzebKoqH2XuIVrO5JDVC8MnCdM24KlXWdWRd+yToOTeBxcpTGFanCLxw EVCb6R9Ddam/ewiL4VuVWIWC7NQcwJ/8zJxLsQhoY42wHqN8IrR2Zhp4BerIiM+3lhBC WfaoBVIWOc04Zu6AzeYI7ueUyKShuskeQdZj4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714568894; x=1715173694; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t4YWfk8RHGxp4UPGDejpf4mUjri4mE+IBxPLABnVZ8s=; b=OV1DwUqZ21siX6i4gX2oOOu8g99FM3eFLxSkmjd6GYHq7LsQelnCze88ceOdOkRaF3 5NUsEm1gRGtCodE56voKJm8PQf9/veBoQXTLQ7wNKvs5+tJFgh831n3nFLgmJEQ+Acq0 +YnWcn1XHAxoTytucukzmMHVeKpykP4/9clN8L2FyIfSVKOiodKJJSifBDRVld4DlHyh SN4CvEa+ra/uxn5k7mImaV4x+3TL4uC0/1wIe3s43DjlTCWYAYL+N3orAZPX+LvV15Y2 D4zElkIXkbWF1gz9kJ75V9WF2fYo0kCxrHSzr6pNkcxA6/vpX8h/rCCLzXqA0hIsdys0 5Qew== X-Forwarded-Encrypted: i=1; AJvYcCUEW6pQs75hLWVJVcMgrWwmYxvT0xvAQqAW4b6fyFUihu3Y/nyFUY2mkt9BQhCqqN/7WBjPfVu1vA1HcZUn1iu0vhXmjtOSHXVRYfwE X-Gm-Message-State: AOJu0Yy8g84gSlBwGb8EZEjysSuVd0ekJAJtyRpaq8/1yWMbaLILqYCn hNrPPP80yVbYJfwaaiGrDdxtA70fwNy2Judo5Uo6FC0VlTEenozMFc+Nzfhgag== X-Google-Smtp-Source: AGHT+IGq5qL9sa8p5ZZp4PD7t6F2nP9QMolqC/miQC8Zec7V4HBvxkYsOoa5pPf0S1YbJ4PC1AiGEA== X-Received: by 2002:a05:6214:c8d:b0:6a0:caba:7e36 with SMTP id r13-20020a0562140c8d00b006a0caba7e36mr2957189qvr.29.1714568894525; Wed, 01 May 2024 06:08:14 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id l26-20020a0c979a000000b0069b10d78445sm12430971qvd.142.2024.05.01.06.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 06:08:13 -0700 (PDT) From: Ricardo Ribalda Date: Wed, 01 May 2024 13:08:09 +0000 Subject: [PATCH v2 1/5] media: bcm2835-unicam: Fix build with !PM 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 Message-Id: <20240501-fix-ipu6-v2-1-a5629a37a0fb@chromium.org> References: <20240501-fix-ipu6-v2-0-a5629a37a0fb@chromium.org> In-Reply-To: <20240501-fix-ipu6-v2-0-a5629a37a0fb@chromium.org> To: Mauro Carvalho Chehab , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Sakari Ailus , Bingbu Cao , Tianshu Qiu Cc: linux-media@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hans Verkuil , Ricardo Ribalda X-Mailer: b4 0.12.4 The driver can only match the device vide the DT table, so the table should always be used, of_match_ptr does not make sense here. Fixes: drivers/media/platform/broadcom/bcm2835-unicam.c:2724:34: warning: =E2=80= =98unicam_of_match=E2=80=99 defined but not used [-Wunused-const-variable= =3D] Signed-off-by: Ricardo Ribalda --- drivers/media/platform/broadcom/bcm2835-unicam.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/med= ia/platform/broadcom/bcm2835-unicam.c index bd2bbb53070e..c590e26fe2cf 100644 --- a/drivers/media/platform/broadcom/bcm2835-unicam.c +++ b/drivers/media/platform/broadcom/bcm2835-unicam.c @@ -2733,7 +2733,7 @@ static struct platform_driver unicam_driver =3D { .driver =3D { .name =3D UNICAM_MODULE_NAME, .pm =3D pm_ptr(&unicam_pm_ops), - .of_match_table =3D of_match_ptr(unicam_of_match), + .of_match_table =3D unicam_of_match, }, }; =20 --=20 2.45.0.rc0.197.gbae5840b3b-goog From nobody Thu Dec 18 23:46:25 2025 Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) (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 EA31E12E1C0 for ; Wed, 1 May 2024 13:08:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714568898; cv=none; b=qhzSVu+3kkBssO/Lyg9YqrMrh3fIDzDa3w0Z0nFZREw9wLgASdv1Mx2x5lCgaajEYJCTvf7vp3Yf5Z6oXlcFZ6/8RZ1lGG4RLqFK4Af60P+rPOA1QpLEY0Br6y52DlNoZfEJKaKCfzG9mp6agn5+rIz0yQPAoeac326ql9HaJ6Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714568898; c=relaxed/simple; bh=ty6e+rZ6GfQw+9UJTsa9bqwh25nZoUPmXmJtIfp/dG0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oZuRL0O81OtUcX7hO1cws2z0ZxaFL/nKUFZN9dCzlQnouXAi7qEGxjcBiC8XPsSbQ5/M3+hHnqEVMQu5peHXR7wC+vYAnrRUaSGAZ0KVeaUEQmyHFYkt2XAfo+k3+8TAAswNKUScRExqx9pIz8rcUU0bmDHCWoFcM7p0Mv5HTcw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=DdzAlgRS; arc=none smtp.client-ip=209.85.167.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="DdzAlgRS" Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3c7510d1bacso3957753b6e.1 for ; Wed, 01 May 2024 06:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1714568896; x=1715173696; 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=yIqrh9vxITy1BabNVOF1UFebsQdvmndT0UdjTkJUAiM=; b=DdzAlgRSg1QWkrM7Y8iwDp2fz5/CexfcilPCZnBuCj2u8oQOzrkrYydOLeijtla92M FIgr/ypssI0Yvs0zOMNndJhCtVq0W/PPfXmxrG9xezCcANVX4OaNDFS9c6ftINvIGTUI fekMPWICsu8Tc4e0w+zEo6cYuHMbewsQHmNBI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714568896; x=1715173696; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yIqrh9vxITy1BabNVOF1UFebsQdvmndT0UdjTkJUAiM=; b=hp2u6DA8LPhoqQ0HINs/rgN3XB8bNMU6KIxXtLx1sCErG8PrqGJQyxBLjWLnul2VBQ GKZhpQG+h127IRQJHUy0ycFVhkGO1rIhJbBL+vmgK/IXS93t6OPVkPyhVVYSTP5mmRyu 1Hqo2n9Wj2SjFa0KDnIaQjcIgppgZXLoRpSUF1QbqHQ6XVpMguKkZpuUrtTx68fcJO6O shcxROewC65+r6950JiqQHRkDSp0nGhRl8tR/XNKkUOsAwWMr2AZeaMRdKxC6DHqxTgw uV0IXLMKnk75l8CEDCMH50qRCRZgS6bkSYPVTZpi5yQNnYSBM9jyhuSKc29ZuCBhJzpR eUaA== X-Forwarded-Encrypted: i=1; AJvYcCXW5CqJepQai5pRBfXHhlq5hMAfyLrUU1foW9JVtfv5pu6lZliJJG2eQeJDqTJNGDomjXnH9AFHCgmmgh0V1uiFPMYopfSk2FiU+3cI X-Gm-Message-State: AOJu0YxxZMzGj9tp5NAirgr1PgiCaeeHmsmP0HlsoJBZWYAQtHXaJpNh jtFaztWwlCCcUfcx9okShqOzbEwTJLsgVi0fJ1rsCS8BoxBkcCsq39qQY7xNHg== X-Google-Smtp-Source: AGHT+IGFB0XhtvNukEJCBP+GoB2QKQrdFJkNpDYdG7PKY86Xxuy4bsWI+JUYUd6ulPAr6zKIgAEWsA== X-Received: by 2002:a05:6808:14d2:b0:3c6:1510:f35a with SMTP id f18-20020a05680814d200b003c61510f35amr3484615oiw.9.1714568896002; Wed, 01 May 2024 06:08:16 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id l26-20020a0c979a000000b0069b10d78445sm12430971qvd.142.2024.05.01.06.08.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 06:08:14 -0700 (PDT) From: Ricardo Ribalda Date: Wed, 01 May 2024 13:08:10 +0000 Subject: [PATCH v2 2/5] media: bcm2835-unicam: Include v4l2-subdev.h 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 Message-Id: <20240501-fix-ipu6-v2-2-a5629a37a0fb@chromium.org> References: <20240501-fix-ipu6-v2-0-a5629a37a0fb@chromium.org> In-Reply-To: <20240501-fix-ipu6-v2-0-a5629a37a0fb@chromium.org> To: Mauro Carvalho Chehab , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Sakari Ailus , Bingbu Cao , Tianshu Qiu Cc: linux-media@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hans Verkuil , Ricardo Ribalda , Laurent Pinchart , kernel test robot X-Mailer: b4 0.12.4 From: Laurent Pinchart The unicam driver uses the v4l2_subdev structure. Include the corresponding header instead of relying on indirect includes. Signed-off-by: Laurent Pinchart Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202404302324.8aTC84kE-lkp@int= el.com/ Reviewed-by: Ricardo Ribalda --- drivers/media/platform/broadcom/bcm2835-unicam.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/med= ia/platform/broadcom/bcm2835-unicam.c index c590e26fe2cf..3c7878d8d79b 100644 --- a/drivers/media/platform/broadcom/bcm2835-unicam.c +++ b/drivers/media/platform/broadcom/bcm2835-unicam.c @@ -55,6 +55,7 @@ #include #include #include +#include #include =20 #include "bcm2835-unicam-regs.h" --=20 2.45.0.rc0.197.gbae5840b3b-goog From nobody Thu Dec 18 23:46:25 2025 Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) (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 7BA6912EBCE for ; Wed, 1 May 2024 13:08:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714568899; cv=none; b=SBrqOP0AaM2jftr3+8yFu8g30QeTJfgXRR0Et5i8ThXXu8MZFr669vlqJGzI5boNGfVjenroQ04Osz/QmC4i9t/6jKa5xNP489EGOCG8YdYX2fH4Np3QOISCX0oU9s48X4iPn3uwJ53rfiABT77Ojl6YGTX8KoojQhDjd03lJh4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714568899; c=relaxed/simple; bh=8+k4R0J4GKcNe8Lj0qIl9PpvkxpwHa0NvERQqlYiLVI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DaaFyf9h0jfGoIa2gohKBg6hPgaom5XnDvc9ejbGt4LG7JOhFcpCpYgbAHu17Zpv326XeGaDvKF1FPqUsz/VPhw8rvclPJdm6nNw1z+5q75rsFDkNnnfO/x8GE9NM8cPUifVWNtf5EAs7WBwr0bJOzOHSGKGHVU/lVRz/4cGGwo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=L3JxEcRE; arc=none smtp.client-ip=209.85.219.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="L3JxEcRE" Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-6a0a7cf89deso20644296d6.0 for ; Wed, 01 May 2024 06:08:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1714568897; x=1715173697; 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=MGnbq45Q3aIVVsIxi/7+e6D9e9h4LgaesLx5MBsPbWY=; b=L3JxEcREpm0+XuYTQT5Dw3VzuQ9GPLgTHgwG+7Gz7HGnn2qJsaVtJ6dN7n0BLqWaKn uobUOKSRaBn2epv9xC5XldpuwDxgxcxMz/CO4geA3k4VPshDePg0B5VgzHi6GBxMzcIW lTSl6qON3jw4IoiQ4KrdSS9Bq9QKMTNusynsc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714568897; x=1715173697; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MGnbq45Q3aIVVsIxi/7+e6D9e9h4LgaesLx5MBsPbWY=; b=jQsMATXV7c+8xYC4wuFU60Wwcyfa2EIjBfTYgnpKQKL0Cgy3s6d1TLa7PFxN1T/kwH h50hdF4ajshJ7khPEgbdRkEn/e2L/HFBpU/Xzia8gaARshWu37veHsxhdXr2L6hgLHOH BYFfLNn8dFwlhEvVeHQ4oY1rlyVfr4gbyg6rJD6deQ1RTlR+EdKd2e4aJg+FPRodR/Kr +AIakvWc7g8/3c5O6pCErAr0417lzQtkDZpiW7NcHv4lWZLAuTr28V0xML1xRWDmTxjV I0nbi1fd7dULaigT7RrrY06M+nDOkYi4pckH/DO5aLkiO11+USh1WaGthsRltM6fcbyw 4LCg== X-Forwarded-Encrypted: i=1; AJvYcCUH2mtsv8Li7MtRIj70Id/a11MQWV9eg+O5CG2LjqIfc+JiDom3mxn8h7r1DXknAfFKAXogOg8K7CfZIU2+PCCc+yP0ENEWPlnuZ7fT X-Gm-Message-State: AOJu0YwVBmAbzOIHYMwZKcXcCKMt3c5GvSJjpmWF9MGAiiWJYMUhSZuX 9aHb8jlN4qKLhsqMINsVZq7MaaV3TtOWE+m1yxX/ZhkseQjb4gJm/9oPbkrB2w== X-Google-Smtp-Source: AGHT+IGUk7F34auoiq/zONzAUqrqK5yTPvc/Cyz94Sk8XJVQJ4h13ALDlS5aFFnC8XNMPBZjW49Tng== X-Received: by 2002:a05:6214:258b:b0:6a0:9361:f988 with SMTP id fq11-20020a056214258b00b006a09361f988mr2350953qvb.30.1714568897459; Wed, 01 May 2024 06:08:17 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id l26-20020a0c979a000000b0069b10d78445sm12430971qvd.142.2024.05.01.06.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 06:08:16 -0700 (PDT) From: Ricardo Ribalda Date: Wed, 01 May 2024 13:08:11 +0000 Subject: [PATCH v2 3/5] media: intel/ipu6: Switch to RUNTIME_PM_OPS() and SYSTEM_SLEEP_PM_OPS 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 Message-Id: <20240501-fix-ipu6-v2-3-a5629a37a0fb@chromium.org> References: <20240501-fix-ipu6-v2-0-a5629a37a0fb@chromium.org> In-Reply-To: <20240501-fix-ipu6-v2-0-a5629a37a0fb@chromium.org> To: Mauro Carvalho Chehab , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Sakari Ailus , Bingbu Cao , Tianshu Qiu Cc: linux-media@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hans Verkuil , Ricardo Ribalda X-Mailer: b4 0.12.4 Replace the old helpers with its modern alternative. Now we do not need to set '__maybe_unused' annotations when we are not enabling the PM configurations. Fixes: drivers/media/pci/intel/ipu6/ipu6.c:841:12: warning: =E2=80=98ipu6_runtime_= resume=E2=80=99 defined but not used [-Wunused-function] drivers/media/pci/intel/ipu6/ipu6.c:806:12: warning: =E2=80=98ipu6_resume= =E2=80=99 defined but not used [-Wunused-function] drivers/media/pci/intel/ipu6/ipu6.c:801:12: warning: =E2=80=98ipu6_suspend= =E2=80=99 defined but not used [-Wunused-function] Signed-off-by: Ricardo Ribalda --- drivers/media/pci/intel/ipu6/ipu6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu6.c b/drivers/media/pci/intel/= ipu6/ipu6.c index 4b1f69d14d71..7bcd9c5a381a 100644 --- a/drivers/media/pci/intel/ipu6/ipu6.c +++ b/drivers/media/pci/intel/ipu6/ipu6.c @@ -860,8 +860,8 @@ static int ipu6_runtime_resume(struct device *dev) } =20 static const struct dev_pm_ops ipu6_pm_ops =3D { - SET_SYSTEM_SLEEP_PM_OPS(&ipu6_suspend, &ipu6_resume) - SET_RUNTIME_PM_OPS(&ipu6_suspend, &ipu6_runtime_resume, NULL) + SYSTEM_SLEEP_PM_OPS(&ipu6_suspend, &ipu6_resume) + RUNTIME_PM_OPS(&ipu6_suspend, &ipu6_runtime_resume, NULL) }; =20 MODULE_DEVICE_TABLE(pci, ipu6_pci_tbl); --=20 2.45.0.rc0.197.gbae5840b3b-goog From nobody Thu Dec 18 23:46:25 2025 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (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 230A612EBEE for ; Wed, 1 May 2024 13:08:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714568900; cv=none; b=kS7pO2VuEkG/iYGLCgUEqopmMW/6MgcNRtaG0DeeWTpS61Ny1+Kre2KlEeJfOH+8mxsp2BEzXOFQiJUSTSgb6GvSdAlGNLtJvkbxy5xK+lSC/jLEFVjMDIlkL1qf+oOYgPlMQUuNW3Ur6P0NabFKSeKKM3le+sMVXelizy0cDGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714568900; c=relaxed/simple; bh=3qd79c0fqWNL/kV7Ki9qUJH7w3sWSFSFrsByKnimP58=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i2c5Bubxkb/Y5NDcegTJvpEROMTtlEwHYyUSL8D8w3K71WICH8AaijLSKBNbRaoVhpQHeeoZJCZXyn3W0HQeFZ/J+ynvx6YvyfJGntRclPbHxzIiL7qCfjYhAPsHDOSSh0PZi8UzkVxFVeDXzowdciRC+tM58NHq21C/PQrtR5w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=jtBk73Ws; arc=none smtp.client-ip=209.85.219.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="jtBk73Ws" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-69b4454e2f1so30058396d6.0 for ; Wed, 01 May 2024 06:08:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1714568898; x=1715173698; 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=iJYWApOjcQI3DrHx79IErrCVRj1fLUdwiqYEPr5bQYw=; b=jtBk73WsghL8bZUaxeVw5X3mG1DUh5NsT6qqKA65W/pe0x9WSpT8C6gTUduWaFFiUq j2CsfzwrHKYtHOE6qvc3YLr3gaz3zk3lMVj2nGZlBDecMM36tiG4UoLtjWMUH+gK0/XD k036uyi/dkPm5TygolK8HXCUwh+qf92AKWWw0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714568898; x=1715173698; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iJYWApOjcQI3DrHx79IErrCVRj1fLUdwiqYEPr5bQYw=; b=qdkNZlRuzVKVdOvsHcPYzrRwhpbo3c/YFEFAThDvM80gnETjhVnzdaYsqmKUsItieo iMd2xJSy3+dKOdgdDaRkhN+EjQHg6v33H6qQS2EjiQchsth/03jAr2SP/ueKDyi5hgK+ jH27TFe9hBzLZ/cxIUznDjRPJ3BAMdUK3N/3mD+S/yTwtrg+3syXsWB7+06nCiGuNDP2 UBHdInBUsSrrelM+W6AKCJz54Bu7C7jFHycS4r6cupmLrOMIyBypf/iYgBFaV5D2nIlc M1gmyLTsv64fBVG5zpiv46zwRnkcOAcYInJcH7fn/AFghaXRQbdLWuaSqEwHHRHXcgJ4 i1ZQ== X-Forwarded-Encrypted: i=1; AJvYcCWRaisxDXP1eUTUbAkmDtv4Y3kAhHFI0ohkgypNQXK0JqEiwF5Gl1O+/82dpqqrRREyq/4qgQ6r0mIP6Ncx0BKor0xaMozw51GqP/sQ X-Gm-Message-State: AOJu0YyNYKMeRQ3OcdHd0oYvpvzNizB7fcwUD67JI5jXkxwHMIKjICxg HYGVvKgx4Ac6mmvkI7fdw2mXJEygDdhTWkAEwC4VpjnJgJ5o7YU8yIoI3V4VSA== X-Google-Smtp-Source: AGHT+IFO+hJ+WIBkK0RGSj2Imq1aY8WSC2eYIFUm01h6JFLPZZsleUnwhnZo+GaOxy6bd3ozLRUOHg== X-Received: by 2002:a05:6214:21e8:b0:6a0:cd98:5ad2 with SMTP id p8-20020a05621421e800b006a0cd985ad2mr3144776qvj.58.1714568898113; Wed, 01 May 2024 06:08:18 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id l26-20020a0c979a000000b0069b10d78445sm12430971qvd.142.2024.05.01.06.08.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 06:08:17 -0700 (PDT) From: Ricardo Ribalda Date: Wed, 01 May 2024 13:08:12 +0000 Subject: [PATCH v2 4/5] media: intel/ipu6: Fix direct dependency Kconfig error 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 Message-Id: <20240501-fix-ipu6-v2-4-a5629a37a0fb@chromium.org> References: <20240501-fix-ipu6-v2-0-a5629a37a0fb@chromium.org> In-Reply-To: <20240501-fix-ipu6-v2-0-a5629a37a0fb@chromium.org> To: Mauro Carvalho Chehab , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Sakari Ailus , Bingbu Cao , Tianshu Qiu Cc: linux-media@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hans Verkuil , Ricardo Ribalda X-Mailer: b4 0.12.4 VIDEO_INTEL_IPU6 selects IPU6_BRIDGE, but they have different set of dependencies. Fixes: WARNING: unmet direct dependencies detected for IPU_BRIDGE Depends on [n]: MEDIA_SUPPORT [=3Dy] && PCI [=3Dy] && MEDIA_PCI_SUPPORT [= =3Dy] && I2C [=3Dy] && ACPI [=3Dn] Selected by [y]: - VIDEO_INTEL_IPU6 [=3Dy] && MEDIA_SUPPORT [=3Dy] && PCI [=3Dy] && MEDIA_= PCI_SUPPORT [=3Dy] && (ACPI [=3Dn] || COMPILE_TEST [=3Dy]) && VIDEO_DEV [= =3Dy] && X86 [=3Dy] && X86_64 [=3Dy] && HAS_DMA [=3Dy] Signed-off-by: Ricardo Ribalda --- drivers/media/pci/intel/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/pci/intel/Kconfig b/drivers/media/pci/intel/Kcon= fig index 04cb3d253486..d9fcddce028b 100644 --- a/drivers/media/pci/intel/Kconfig +++ b/drivers/media/pci/intel/Kconfig @@ -6,7 +6,8 @@ source "drivers/media/pci/intel/ivsc/Kconfig" =20 config IPU_BRIDGE tristate "Intel IPU Bridge" - depends on I2C && ACPI + depends on ACPI || COMPILE_TEST + depends on I2C help The IPU bridge is a helper library for Intel IPU drivers to function on systems shipped with Windows. --=20 2.45.0.rc0.197.gbae5840b3b-goog From nobody Thu Dec 18 23:46:25 2025 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (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 CD24112F389 for ; Wed, 1 May 2024 13:08:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714568902; cv=none; b=Wij7XEetGrlmCUhezPqYQMSyyC8PJYQWv4N0oYl/n3mb5TCS6nJjvc7tXikC5PT91n6SX/33RGVkVThJBKd38xTxdE+7L6uVXATkJ86hgKnCdlMl7E79pYOqJydR+XCyeHvj7wDLQarMNj+4jG4RoeS/iXeC8AGJz3WUG34dC/4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714568902; c=relaxed/simple; bh=yyqc5fgSD9exFQ4GhDz78AnhyoMaV08hu504NdFrDGM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lUFJUCRQ5kH4/Xt3xExc66c1q/OP3D9F+KbGLnrRODP/T4+Jjc7i8ou+ZhkXAvIzLIBQ06kVUUqo9/0vedpwzby+2bMfNy5l1zS7Gfpywg9VPVpTvk1+plAPuytJ6e7gpfr46D2WFe9zuNWug+kZQdPcTPM/HBpn5qdOL+JI9+E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Il7xkjo4; arc=none smtp.client-ip=209.85.219.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Il7xkjo4" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-69b782287f9so32382446d6.0 for ; Wed, 01 May 2024 06:08:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1714568900; x=1715173700; 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=fuTS2475wBKHSkCVqPTkc/u+zH5CwzTowAsuQdTWDz8=; b=Il7xkjo4lviR6CZvxPSKAMzpF7uSe2GayEgGO1P5jLWKmK3+nNKX4AA8rxJBtPyn6m D9TX+Qg/fcuuCYy+qqMK6US1iuatLlBmUkVk2J4SeQRUK8f8sXNbU/ycz8FeFj1uz2xi MKPneKs0T3anm107zE9nFjEyRkHPqjGLM9fJM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714568900; x=1715173700; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fuTS2475wBKHSkCVqPTkc/u+zH5CwzTowAsuQdTWDz8=; b=PcfEdefinB3SjIT7a+pSI4KrZNM4MMmvoI+avhFTxt8Qb1xwb8M/T4LFbiYuTTxMSE KwdsB1dfi/S+uLGe3C9Iq0oAEDsdauJW6HClUfw9zKXljv9prBs7z5fTurLp2qJ53kuc Prslr4ztSggTmX8Zq71ln2v+jJw4pPh0SEx6VKiHwQgcloryQtvk2A1ZPlT9RW4Z2jV+ b/ObADb34ZSNmU0Ai1rZYg3xJQQbi/Mfp1DeuZ99uG50Q1Agr9Ta82JZOfRAxzo4kLWT ov4xqjl4zqbFPdrGc91ulncWiBuh5BjAJW+QitcclOLDr2i7+u2XsDoJbDPNUBK4RI/j DfgQ== X-Forwarded-Encrypted: i=1; AJvYcCWWRdigMJ3igyqLk3qv+JYqT+KqlBKqu204ZgJxL8qZWIqefTPDNVcSr3FohST/7uhIZYAyh++6ssetd6GYbjsRmBPHpw4QpFD8etHK X-Gm-Message-State: AOJu0Yxwgr2AzJUg8V4MCxt8qHaMCeOE+j1S6I4y1030MpmvISckGsH0 PfCQsth6algbmrP7Mm72g0zKXjB9naPzE5tAAGZ4qwUaqvDjl27ckb0CBrP9cw== X-Google-Smtp-Source: AGHT+IGxtLuMsV5IT224KA2ifYps0IBof8gR94o8Jv8PY5+SVS3jtjRCG5zyAZxhnmApUmcG9XpHAg== X-Received: by 2002:ad4:5cc7:0:b0:6a0:c933:4d7d with SMTP id iu7-20020ad45cc7000000b006a0c9334d7dmr2626974qvb.48.1714568899557; Wed, 01 May 2024 06:08:19 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id l26-20020a0c979a000000b0069b10d78445sm12430971qvd.142.2024.05.01.06.08.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 06:08:18 -0700 (PDT) From: Ricardo Ribalda Date: Wed, 01 May 2024 13:08:13 +0000 Subject: [PATCH v2 5/5] media: intel/ipu6: Fix build with !ACPI 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 Message-Id: <20240501-fix-ipu6-v2-5-a5629a37a0fb@chromium.org> References: <20240501-fix-ipu6-v2-0-a5629a37a0fb@chromium.org> In-Reply-To: <20240501-fix-ipu6-v2-0-a5629a37a0fb@chromium.org> To: Mauro Carvalho Chehab , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Sakari Ailus , Bingbu Cao , Tianshu Qiu Cc: linux-media@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hans Verkuil , Ricardo Ribalda X-Mailer: b4 0.12.4 Modify the code so it can be compiled tested in configurations that do not have ACPI enabled. Fixes: drivers/media/pci/intel/ipu-bridge.c:103:30: error: implicit declaration of= function =E2=80=98acpi_device_handle=E2=80=99; did you mean =E2=80=98acpi_= fwnode_handle=E2=80=99? [-Werror=3Dimplicit-function-declaration] drivers/media/pci/intel/ipu-bridge.c:103:30: warning: initialization of =E2= =80=98acpi_handle=E2=80=99 {aka =E2=80=98void *=E2=80=99} from =E2=80=98int= =E2=80=99 makes pointer from integer without a cast [-Wint-conversion] drivers/media/pci/intel/ipu-bridge.c:110:17: error: implicit declaration of= function =E2=80=98for_each_acpi_dev_match=E2=80=99 [-Werror=3Dimplicit-fun= ction-declaration] drivers/media/pci/intel/ipu-bridge.c:110:74: error: expected =E2=80=98;=E2= =80=99 before =E2=80=98for_each_acpi_consumer_dev=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:104:29: warning: unused variable =E2= =80=98consumer=E2=80=99 [-Wunused-variable] drivers/media/pci/intel/ipu-bridge.c:103:21: warning: unused variable =E2= =80=98handle=E2=80=99 [-Wunused-variable] drivers/media/pci/intel/ipu-bridge.c:166:38: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:185:43: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:191:30: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:196:30: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:202:30: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:223:31: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:236:18: error: implicit declaration of= function =E2=80=98acpi_get_physical_device_location=E2=80=99 [-Werror=3Dim= plicit-function-declaration] drivers/media/pci/intel/ipu-bridge.c:236:56: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:238:31: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:256:31: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:275:31: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:280:30: error: invalid use of undefine= d type =E2=80=98struct acpi_device=E2=80=99 drivers/media/pci/intel/ipu-bridge.c:469:26: error: implicit declaration of= function =E2=80=98acpi_device_hid=E2=80=99; did you mean =E2=80=98dmi_devi= ce_id=E2=80=99? [-Werror=3Dimplicit-function-declaration] drivers/media/pci/intel/ipu-bridge.c:468:74: warning: format =E2=80=98%s=E2= =80=99 expects argument of type =E2=80=98char *=E2=80=99, but argument 4 ha= s type =E2=80=98int=E2=80=99 [-Wformat=3D] drivers/media/pci/intel/ipu-bridge.c:637:58: error: expected =E2=80=98;=E2= =80=99 before =E2=80=98{=E2=80=99 token drivers/media/pci/intel/ipu-bridge.c:696:1: warning: label =E2=80=98err_put= _adev=E2=80=99 defined but not used [-Wunused-label] drivers/media/pci/intel/ipu-bridge.c:693:1: warning: label =E2=80=98err_put= _ivsc=E2=80=99 defined but not used [-Wunused-label] drivers/media/pci/intel/ipu-bridge.c:691:1: warning: label =E2=80=98err_fre= e_swnodes=E2=80=99 defined but not used [-Wunused-label] drivers/media/pci/intel/ipu-bridge.c:632:40: warning: unused variable =E2= =80=98primary=E2=80=99 [-Wunused-variable] drivers/media/pci/intel/ipu-bridge.c:632:31: warning: unused variable =E2= =80=98fwnode=E2=80=99 [-Wunused-variable] drivers/media/pci/intel/ipu-bridge.c:733:73: error: expected =E2=80=98;=E2= =80=99 before =E2=80=98{=E2=80=99 token drivers/media/pci/intel/ipu-bridge.c:725:24: warning: unused variable =E2= =80=98csi_dev=E2=80=99 [-Wunused-variable] drivers/media/pci/intel/ipu-bridge.c:724:43: warning: unused variable =E2= =80=98adev=E2=80=99 [-Wunused-variable] drivers/media/pci/intel/ipu-bridge.c:599:12: warning: =E2=80=98ipu_bridge_i= nstantiate_ivsc=E2=80=99 defined but not used [-Wunused-function] drivers/media/pci/intel/ipu-bridge.c:444:13: warning: =E2=80=98ipu_bridge_c= reate_connection_swnodes=E2=80=99 defined but not used [-Wunused-function] drivers/media/pci/intel/ipu-bridge.c:297:13: warning: =E2=80=98ipu_bridge_c= reate_fwnode_properties=E2=80=99 defined but not used [-Wunused-function] drivers/media/pci/intel/ipu-bridge.c:155:12: warning: =E2=80=98ipu_bridge_c= heck_ivsc_dev=E2=80=99 defined but not used [-Wunused-function] Signed-off-by: Ricardo Ribalda --- drivers/media/pci/intel/ipu-bridge.c | 66 +++++++++++++++++++++++++-------= ---- 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel= /ipu-bridge.c index e994db4f4d91..61750cc98d70 100644 --- a/drivers/media/pci/intel/ipu-bridge.c +++ b/drivers/media/pci/intel/ipu-bridge.c @@ -15,6 +15,8 @@ #include #include =20 +#define ADEV_DEV(adev) ACPI_PTR(&((adev)->dev)) + /* * 92335fcf-3203-4472-af93-7b4453ac29da * @@ -87,6 +89,7 @@ static const char * const ipu_vcm_types[] =3D { "lc898212axb", }; =20 +#if IS_ENABLED(CONFIG_ACPI) /* * Used to figure out IVSC acpi device by ipu_bridge_get_ivsc_acpi_dev() * instead of device and driver match to probe IVSC device. @@ -100,13 +103,13 @@ static const struct acpi_device_id ivsc_acpi_ids[] = =3D { =20 static struct acpi_device *ipu_bridge_get_ivsc_acpi_dev(struct acpi_device= *adev) { - acpi_handle handle =3D acpi_device_handle(adev); - struct acpi_device *consumer, *ivsc_adev; unsigned int i; =20 for (i =3D 0; i < ARRAY_SIZE(ivsc_acpi_ids); i++) { const struct acpi_device_id *acpi_id =3D &ivsc_acpi_ids[i]; + struct acpi_device *consumer, *ivsc_adev; =20 + acpi_handle handle =3D acpi_device_handle(adev); for_each_acpi_dev_match(ivsc_adev, acpi_id->id, NULL, -1) /* camera sensor depends on IVSC in DSDT if exist */ for_each_acpi_consumer_dev(ivsc_adev, consumer) @@ -118,6 +121,12 @@ static struct acpi_device *ipu_bridge_get_ivsc_acpi_de= v(struct acpi_device *adev =20 return NULL; } +#else +static struct acpi_device *ipu_bridge_get_ivsc_acpi_dev(struct acpi_device= *adev) +{ + return NULL; +} +#endif =20 static int ipu_bridge_match_ivsc_dev(struct device *dev, const void *adev) { @@ -163,7 +172,7 @@ static int ipu_bridge_check_ivsc_dev(struct ipu_sensor = *sensor, csi_dev =3D ipu_bridge_get_ivsc_csi_dev(adev); if (!csi_dev) { acpi_dev_put(adev); - dev_err(&adev->dev, "Failed to find MEI CSI dev\n"); + dev_err(ADEV_DEV(adev), "Failed to find MEI CSI dev\n"); return -ENODEV; } =20 @@ -182,24 +191,25 @@ static int ipu_bridge_read_acpi_buffer(struct acpi_de= vice *adev, char *id, acpi_status status; int ret =3D 0; =20 - status =3D acpi_evaluate_object(adev->handle, id, NULL, &buffer); + status =3D acpi_evaluate_object(ACPI_PTR(adev->handle), + id, NULL, &buffer); if (ACPI_FAILURE(status)) return -ENODEV; =20 obj =3D buffer.pointer; if (!obj) { - dev_err(&adev->dev, "Couldn't locate ACPI buffer\n"); + dev_err(ADEV_DEV(adev), "Couldn't locate ACPI buffer\n"); return -ENODEV; } =20 if (obj->type !=3D ACPI_TYPE_BUFFER) { - dev_err(&adev->dev, "Not an ACPI buffer\n"); + dev_err(ADEV_DEV(adev), "Not an ACPI buffer\n"); ret =3D -ENODEV; goto out_free_buff; } =20 if (obj->buffer.length > size) { - dev_err(&adev->dev, "Given buffer is too small\n"); + dev_err(ADEV_DEV(adev), "Given buffer is too small\n"); ret =3D -EINVAL; goto out_free_buff; } @@ -220,7 +230,7 @@ static u32 ipu_bridge_parse_rotation(struct acpi_device= *adev, case IPU_SENSOR_ROTATION_INVERTED: return 180; default: - dev_warn(&adev->dev, + dev_warn(ADEV_DEV(adev), "Unknown rotation %d. Assume 0 degree rotation\n", ssdb->degree); return 0; @@ -230,12 +240,14 @@ static u32 ipu_bridge_parse_rotation(struct acpi_devi= ce *adev, static enum v4l2_fwnode_orientation ipu_bridge_parse_orientation(struct ac= pi_device *adev) { enum v4l2_fwnode_orientation orientation; - struct acpi_pld_info *pld; - acpi_status status; + struct acpi_pld_info *pld =3D NULL; + acpi_status status =3D AE_ERROR; =20 +#if IS_ENABLED(CONFIG_ACPI) status =3D acpi_get_physical_device_location(adev->handle, &pld); +#endif if (ACPI_FAILURE(status)) { - dev_warn(&adev->dev, "_PLD call failed, using default orientation\n"); + dev_warn(ADEV_DEV(adev), "_PLD call failed, using default orientation\n"= ); return V4L2_FWNODE_ORIENTATION_EXTERNAL; } =20 @@ -253,7 +265,8 @@ static enum v4l2_fwnode_orientation ipu_bridge_parse_or= ientation(struct acpi_dev orientation =3D V4L2_FWNODE_ORIENTATION_EXTERNAL; break; default: - dev_warn(&adev->dev, "Unknown _PLD panel val %d\n", pld->panel); + dev_warn(ADEV_DEV(adev), "Unknown _PLD panel val %d\n", + pld->panel); orientation =3D V4L2_FWNODE_ORIENTATION_EXTERNAL; break; } @@ -272,12 +285,12 @@ int ipu_bridge_parse_ssdb(struct acpi_device *adev, s= truct ipu_sensor *sensor) return ret; =20 if (ssdb.vcmtype > ARRAY_SIZE(ipu_vcm_types)) { - dev_warn(&adev->dev, "Unknown VCM type %d\n", ssdb.vcmtype); + dev_warn(ADEV_DEV(adev), "Unknown VCM type %d\n", ssdb.vcmtype); ssdb.vcmtype =3D 0; } =20 if (ssdb.lanes > IPU_MAX_LANES) { - dev_err(&adev->dev, "Number of lanes in SSDB is invalid\n"); + dev_err(ADEV_DEV(adev), "Number of lanes in SSDB is invalid\n"); return -EINVAL; } =20 @@ -465,8 +478,14 @@ static void ipu_bridge_create_connection_swnodes(struc= t ipu_bridge *bridge, sensor->ipu_properties); =20 if (sensor->csi_dev) { + const char *device_hid =3D ""; + +#if IS_ENABLED(CONFIG_ACPI) + device_hid =3D acpi_device_hid(sensor->ivsc_adev); +#endif + snprintf(sensor->ivsc_name, sizeof(sensor->ivsc_name), "%s-%u", - acpi_device_hid(sensor->ivsc_adev), sensor->link); + device_hid, sensor->link); =20 nodes[SWNODE_IVSC_HID] =3D NODE_SENSOR(sensor->ivsc_name, sensor->ivsc_properties); @@ -631,11 +650,15 @@ static int ipu_bridge_connect_sensor(const struct ipu= _sensor_config *cfg, { struct fwnode_handle *fwnode, *primary; struct ipu_sensor *sensor; - struct acpi_device *adev; + struct acpi_device *adev =3D NULL; int ret; =20 +#if IS_ENABLED(CONFIG_ACPI) for_each_acpi_dev_match(adev, cfg->hid, NULL, -1) { - if (!adev->status.enabled) +#else + while (true) { +#endif + if (!ACPI_PTR(adev->status.enabled)) continue; =20 if (bridge->n_sensors >=3D IPU_MAX_PORTS) { @@ -671,7 +694,7 @@ static int ipu_bridge_connect_sensor(const struct ipu_s= ensor_config *cfg, goto err_free_swnodes; } =20 - sensor->adev =3D acpi_dev_get(adev); + sensor->adev =3D ACPI_PTR(acpi_dev_get(adev)); =20 primary =3D acpi_fwnode_handle(adev); primary->secondary =3D fwnode; @@ -727,11 +750,16 @@ static int ipu_bridge_ivsc_is_ready(void) unsigned int i; =20 for (i =3D 0; i < ARRAY_SIZE(ipu_supported_sensors); i++) { +#if IS_ENABLED(CONFIG_ACPI) const struct ipu_sensor_config *cfg =3D &ipu_supported_sensors[i]; =20 for_each_acpi_dev_match(sensor_adev, cfg->hid, NULL, -1) { - if (!sensor_adev->status.enabled) +#else + while (true) { + sensor_adev =3D NULL; +#endif + if (!ACPI_PTR(sensor_adev->status.enabled)) continue; =20 adev =3D ipu_bridge_get_ivsc_acpi_dev(sensor_adev); --=20 2.45.0.rc0.197.gbae5840b3b-goog