From 1e25f1ef9a7cdfadd8df31cdfd9e99af5416e235 Mon Sep 17 00:00:00 2001 From: You-Sheng Yang Date: Thu, 8 Aug 2024 14:30:51 +0800 Subject: [PATCH] backport: media: ipu6: fix compilation with kernels >= 6.11 Accommodate to v6.11-rc1 commit d69d804845985 ("driver core: have match() callback in struct bus_type take a const *"). Bug-Ubuntu: https://bugs.launchpad.net/bugs/2076262 Signed-off-by: You-Sheng Yang --- drivers/media/pci/intel/ipu-bus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/pci/intel/ipu-bus.c b/drivers/media/pci/intel/ipu-bus.c index 0569ccb61969..234fde8f1a42 100644 --- a/drivers/media/pci/intel/ipu-bus.c +++ b/drivers/media/pci/intel/ipu-bus.c @@ -75,9 +75,13 @@ static const struct dev_pm_ops ipu_bus_pm_ops = { #define IPU_BUS_PM_OPS NULL #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0) static int ipu_bus_match(struct device *dev, struct device_driver *drv) +#else +static int ipu_bus_match(struct device *dev, const struct device_driver *drv) +#endif { - struct ipu_bus_driver *adrv = to_ipu_bus_driver(drv); + const struct ipu_bus_driver *adrv = to_ipu_bus_driver(drv); dev_dbg(dev, "bus match: \"%s\" --- \"%s\"\n", dev_name(dev), adrv->wanted);