From patchwork Wed Dec 11 16:07:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13903711 Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) (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 2B4191DD0F6 for ; Wed, 11 Dec 2024 16:07:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733933247; cv=none; b=t0mkYiwhuOL3lbaJKtQa2gzmmw+UV7y/9s0kB5BOCFmKTDpIqGQdoiU6Paf5N6zc5CzKJFwIDrz20/TM3yw44yxbapkjwdzOFKEwJ4wG2W5W4k/7AoApzJS2QxdZ7KoNaqCenfWEDBI3Z0j6nOe+4cL2rs0u3gH+Gaz2aSl8KHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733933247; c=relaxed/simple; bh=Rthe3LzHY0QJPosKabOqFJY90O39hBmNGtzh12F+k2M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TV/RHDNocGLt7VP/prnJp+Y+jsZoPxfXdnBpahR250VXLk85rmK0BmKXh7Eqy+TO7D5qD84I+lxUi5OAsvSYV+OAvBUEbSTpI0umliYmyn1CEaeY6zMRMaS1fPFdXWS8lz2xWZnwQkJWzMUkTmtkKtp9UR5X8UvB1iWGss0jtq8= 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=lL97qsk1; arc=none smtp.client-ip=209.85.219.48 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="lL97qsk1" Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-6d933736380so14269256d6.1 for ; Wed, 11 Dec 2024 08:07:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733933245; x=1734538045; 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=Essqe2WEjNsh1+1eTJTpKRXpLjov7BKteAS8plE/7UE=; b=lL97qsk1wI9Y7/MtqAZcUwUeRNSY/gsIPCf1JH1M2Bb8Rh1KttDMR4rp6aTx+MAoCl d9PxQfqX/GZeUaYQXENGtFbyD85QkwrgnY/SqKLtt3lMojMEB8NWZ34MbXSsnCV6mi8U GCTdDdJYK+0I7z/5KD/1PCXOcnW76grJYhXPg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733933245; x=1734538045; 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=Essqe2WEjNsh1+1eTJTpKRXpLjov7BKteAS8plE/7UE=; b=WUdynajg1tdlkhanmoZbt6P5KKUeh3ckxb4Sscus1KN5MLfvlOOxjdt06DZHHQA/EG HFCeQcPnoeRxq1UI4oMqZqAViiIlGB+xa8q0r4gSXyvFEEemQXTAnJOt9tdzJODA1C4u Obg8qNgysKdnUW11VmQxZhhHWstO6ZmNwLXwiuI1XkSjpnmOC4UdS+WjI+YSGYd8Ybg+ khJYOdRoD89RiZKFDiGUJ73cBXrOQDqXw/KeTBwMdWTne388n9/joAJvOJP36acsDLZ7 coCNqw+Ufs2iEq/vQRsCgGGW3yPFGlErsXEDwmSsZwYzxQLkh7vwpk17zbpSVoC8YPKH pkMA== X-Forwarded-Encrypted: i=1; AJvYcCV8QN5fDYTZukb31fiS40mQgBJ3ieWbnDhJpJGX2HLezB6EqFJiTvqYGPYYaYn4z9H8T4JD0Vwznouw@vger.kernel.org X-Gm-Message-State: AOJu0Ywxj1zQAS54MkCErg/Z7Utnp+bFiNk2TKSzFs77iLHtTX3/zEAj 4uzD5dtFWxRUUoPUN1wxdqcmLvnvpOk2ES0NCYNmzbRUdnnbDI8JjB2fQ7WRLA== X-Gm-Gg: ASbGnct+PedZ4pJ5GxXfeIbfjnFKQ7z0/+WeUygkE/wZwlbpbCGu6SaXdUB9Vpbx89A HVNBqRJipLJENCPcrAQjpRjWDfSRqDwOwbdGEmAZetlAjAvxDkM/qXhhSR99DOp7yQ/YMtnmr7m X4dBjr4sRgl1t976w+JVk9hDKs1yHRtNFTIWQDSeAbSj0A8AlbDjpwVnU24j3sJkebqtR0Bqf+9 sJlcuAfnh8r0Irr2+zEkEqVIecSEnzJJzt6eNmTMbwMOqdcsRSDgO+//tnP9huYXCPzCKJWclGs V44egzfssqV9tWT9JQHWh+/VttHj X-Google-Smtp-Source: AGHT+IE2ZjzhhF3KT4N00BscK7M3J3K9+kILugqUUTPdX4rGdXCCT0e/jhysbXYNIB+9mUv7WWWTlg== X-Received: by 2002:ad4:5962:0:b0:6d8:8e0f:8c03 with SMTP id 6a1803df08f44-6d934aec01cmr68660266d6.18.1733933245095; Wed, 11 Dec 2024 08:07:25 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8daa00671sm71484946d6.88.2024.12.11.08.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2024 08:07:24 -0800 (PST) From: Ricardo Ribalda Date: Wed, 11 Dec 2024 16:07:22 +0000 Subject: [PATCH v4 6/6] media: ipu-bridge: Remove unneeded conditional compilations Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241211-fix-ipu-v4-6-4102e97aceb6@chromium.org> References: <20241211-fix-ipu-v4-0-4102e97aceb6@chromium.org> In-Reply-To: <20241211-fix-ipu-v4-0-4102e97aceb6@chromium.org> To: "Rafael J. Wysocki" , Len Brown , Robert Moore , "Rafael J. Wysocki" Cc: Sakari Ailus , Dan Carpenter , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev, Ricardo Ribalda , Mauro Carvalho Chehab X-Mailer: b4 0.13.0 The ACPI headers have introduced implementations for some of their functions when the kernel is not configured with ACPI. Let's use them instead of our conditional compilation. It is easier to maintain and less prone to errors. Reviewed-by: Mauro Carvalho Chehab Fixes: 8810e055b575 ("media: intel/ipu6: Fix build with !ACPI") Acked-by: Mauro Carvalho Chehab Signed-off-by: Ricardo Ribalda --- drivers/media/pci/intel/ipu-bridge.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c index a0e9a71580b5..1db994338fdf 100644 --- a/drivers/media/pci/intel/ipu-bridge.c +++ b/drivers/media/pci/intel/ipu-bridge.c @@ -2,6 +2,7 @@ /* Author: Dan Scally */ #include +#include #include #include #include @@ -107,7 +108,6 @@ static const char * const ipu_vcm_types[] = { "lc898212axb", }; -#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. @@ -127,11 +127,11 @@ static struct acpi_device *ipu_bridge_get_ivsc_acpi_dev(struct acpi_device *adev const struct acpi_device_id *acpi_id = &ivsc_acpi_ids[i]; struct acpi_device *consumer, *ivsc_adev; - acpi_handle handle = acpi_device_handle(adev); + acpi_handle handle = acpi_device_handle(ACPI_PTR(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) - if (consumer->handle == handle) { + if (ACPI_PTR(consumer->handle) == handle) { acpi_dev_put(consumer); return ivsc_adev; } @@ -139,12 +139,6 @@ static struct acpi_device *ipu_bridge_get_ivsc_acpi_dev(struct acpi_device *adev return NULL; } -#else -static struct acpi_device *ipu_bridge_get_ivsc_acpi_dev(struct acpi_device *adev) -{ - return NULL; -} -#endif static int ipu_bridge_match_ivsc_dev(struct device *dev, const void *adev) { @@ -261,9 +255,8 @@ static enum v4l2_fwnode_orientation ipu_bridge_parse_orientation(struct acpi_dev struct acpi_pld_info *pld = NULL; acpi_status status = AE_ERROR; -#if IS_ENABLED(CONFIG_ACPI) - status = acpi_get_physical_device_location(adev->handle, &pld); -#endif + status = acpi_get_physical_device_location(ACPI_PTR(adev->handle), + &pld); if (ACPI_FAILURE(status)) { dev_warn(ADEV_DEV(adev), "_PLD call failed, using default orientation\n"); return V4L2_FWNODE_ORIENTATION_EXTERNAL; @@ -498,9 +491,7 @@ static void ipu_bridge_create_connection_swnodes(struct ipu_bridge *bridge, if (sensor->csi_dev) { const char *device_hid = ""; -#if IS_ENABLED(CONFIG_ACPI) device_hid = acpi_device_hid(sensor->ivsc_adev); -#endif snprintf(sensor->ivsc_name, sizeof(sensor->ivsc_name), "%s-%u", device_hid, sensor->link); @@ -671,11 +662,7 @@ static int ipu_bridge_connect_sensor(const struct ipu_sensor_config *cfg, struct acpi_device *adev = NULL; int ret; -#if IS_ENABLED(CONFIG_ACPI) for_each_acpi_dev_match(adev, cfg->hid, NULL, -1) { -#else - while (true) { -#endif if (!ACPI_PTR(adev->status.enabled)) continue; @@ -768,15 +755,10 @@ static int ipu_bridge_ivsc_is_ready(void) unsigned int i; for (i = 0; i < ARRAY_SIZE(ipu_supported_sensors); i++) { -#if IS_ENABLED(CONFIG_ACPI) const struct ipu_sensor_config *cfg = &ipu_supported_sensors[i]; for_each_acpi_dev_match(sensor_adev, cfg->hid, NULL, -1) { -#else - while (true) { - sensor_adev = NULL; -#endif if (!ACPI_PTR(sensor_adev->status.enabled)) continue;