diff mbox series

[1/1] ipu3-cio2: Build bridge only if ACPI is enabled

Message ID 20210202201440.10613-1-sakari.ailus@linux.intel.com
State Accepted
Commit d12783207ae8f687e1bf9d79803a705041ff2679
Headers show
Series [1/1] ipu3-cio2: Build bridge only if ACPI is enabled | expand

Commit Message

Sakari Ailus Feb. 2, 2021, 8:14 p.m. UTC
ipu3-cio2-bridge uses several features of the ACPI framework that have no
meaningful replacement when ACPI is disabled. Instead of adding #ifdefs to
the affected places, only build the bridge code if CONFIG_ACPI is enabled.

Fixes: 803abec64ef9 ("media: ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
Hi Randy,

Thanks for reporting this.

This patch should address the problem.

 drivers/media/pci/intel/ipu3/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Sakari Ailus Feb. 2, 2021, 8:30 p.m. UTC | #1
On Tue, Feb 02, 2021 at 12:24:54PM -0800, Randy Dunlap wrote:
> On 2/2/21 12:14 PM, Sakari Ailus wrote:
> > ipu3-cio2-bridge uses several features of the ACPI framework that have no
> > meaningful replacement when ACPI is disabled. Instead of adding #ifdefs to
> > the affected places, only build the bridge code if CONFIG_ACPI is enabled.
> > 
> > Fixes: 803abec64ef9 ("media: ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver")
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

Thanks! I'll include this in a pull request to Mauro shortly.
Sakari Ailus Feb. 2, 2021, 10:02 p.m. UTC | #2
On Tue, Feb 02, 2021 at 09:37:47PM +0000, Daniel Scally wrote:
> On 02/02/2021 20:30, Sakari Ailus wrote:
> > On Tue, Feb 02, 2021 at 12:24:54PM -0800, Randy Dunlap wrote:
> >> On 2/2/21 12:14 PM, Sakari Ailus wrote:
> >>> ipu3-cio2-bridge uses several features of the ACPI framework that have no
> >>> meaningful replacement when ACPI is disabled. Instead of adding #ifdefs to
> >>> the affected places, only build the bridge code if CONFIG_ACPI is enabled.
> >>>
> >>> Fixes: 803abec64ef9 ("media: ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver")
> >>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> >> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
> > Thanks! I'll include this in a pull request to Mauro shortly.
> >
> Ah - thank you both; sorry to have missed that.

No worries; this was missed in review, too. There are just combinations you
don't always end up testing before merging the patches.
diff mbox series

Patch

diff --git a/drivers/media/pci/intel/ipu3/Kconfig b/drivers/media/pci/intel/ipu3/Kconfig
index 24f4e79fe0cb..dce8274c81e6 100644
--- a/drivers/media/pci/intel/ipu3/Kconfig
+++ b/drivers/media/pci/intel/ipu3/Kconfig
@@ -20,7 +20,7 @@  config VIDEO_IPU3_CIO2
 
 config CIO2_BRIDGE
 	bool "IPU3 CIO2 Sensors Bridge"
-	depends on VIDEO_IPU3_CIO2
+	depends on VIDEO_IPU3_CIO2 && ACPI
 	help
 	  This extension provides an API for the ipu3-cio2 driver to create
 	  connections to cameras that are hidden in the SSDB buffer in ACPI.