[PATCH 18/30][SRU][Jammy] UBUNTU: SAUCE: Fix build error for kernel 5.15

You-Sheng Yang vicamo.yang at canonical.com
Mon Jan 17 15:19:16 UTC 2022


From: Ignacio Hernandez <ignacio.hernandez at gmail.com>

BugLink: https://bugs.launchpad.net/bugs/1955383

Signed-off-by: Ignacio Hernandez <ignacio.hernandez at gmail.com>
(cherry picked from commit 8659a022b39a23409c18341c3877689c0ce2ecb3 github.com/intel/ipu6-drivers)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
 drivers/media/pci/intel/ipu-bus.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/media/pci/intel/ipu-bus.c b/drivers/media/pci/intel/ipu-bus.c
index 084aa5f946d0..d3b7f44c0e8a 100644
--- a/drivers/media/pci/intel/ipu-bus.c
+++ b/drivers/media/pci/intel/ipu-bus.c
@@ -119,15 +119,13 @@ static int ipu_bus_probe(struct device *dev)
 	return rval;
 }
 
-static int ipu_bus_remove(struct device *dev)
+static void ipu_bus_remove(struct device *dev)
 {
 	struct ipu_bus_device *adev = to_ipu_bus_device(dev);
 	struct ipu_bus_driver *adrv = to_ipu_bus_driver(dev->driver);
 
 	if (adrv->remove)
 		adrv->remove(adev);
-
-	return 0;
 }
 
 static struct bus_type ipu_bus = {
-- 
2.33.1




More information about the kernel-team mailing list