12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182 |
- From ce9de5d1bf9d21c088b01ce9da6f7ff02b0d863d Mon Sep 17 00:00:00 2001
- From: InterLinked1 <24227567+InterLinked1@users.noreply.github.com>
- Date: Mon, 23 Sep 2024 08:04:54 -0400
- Subject: [PATCH] xpp, sysfs: Use const struct device_device if needed.
- Kernel commit d69d804845985c29ab5be5a4b3b1f4787893daf8
- changed struct device_driver to be const, so make the
- arguments const on kernels 6.11 and newer.
- Resolves: #63
- Upstream: https://github.com/asterisk/dahdi-linux/pull/64
- Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
- ---
- drivers/dahdi/dahdi-sysfs-chan.c | 4 ++++
- drivers/dahdi/dahdi-sysfs.c | 4 ++++
- drivers/dahdi/xpp/xbus-sysfs.c | 8 ++++++++
- 3 files changed, 16 insertions(+)
- diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c
- index 09d7317..35b7bd4 100644
- --- a/drivers/dahdi/dahdi-sysfs-chan.c
- +++ b/drivers/dahdi/dahdi-sysfs-chan.c
- @@ -220,7 +220,11 @@ static void chan_release(struct device *dev)
- chan_dbg(DEVICES, chan, "SYSFS\n");
- }
-
- +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
- +static int chan_match(struct device *dev, const struct device_driver *driver)
- +#else
- static int chan_match(struct device *dev, struct device_driver *driver)
- +#endif /* LINUX_VERSION_CODE */
- {
- struct dahdi_chan *chan;
-
- diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c
- index 7477ebc..246514c 100644
- --- a/drivers/dahdi/dahdi-sysfs.c
- +++ b/drivers/dahdi/dahdi-sysfs.c
- @@ -42,7 +42,11 @@ module_param(tools_rootdir, charp, 0444);
- MODULE_PARM_DESC(tools_rootdir,
- "root directory of all tools paths (default /)");
-
- +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
- +static int span_match(struct device *dev, const struct device_driver *driver)
- +#else
- static int span_match(struct device *dev, struct device_driver *driver)
- +#endif /* LINUX_VERSION_CODE */
- {
- return 1;
- }
- diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c
- index 177048b..f78a15e 100644
- --- a/drivers/dahdi/xpp/xbus-sysfs.c
- +++ b/drivers/dahdi/xpp/xbus-sysfs.c
- @@ -397,7 +397,11 @@ static struct attribute *xbus_dev_attrs[] = {
- ATTRIBUTE_GROUPS(xbus_dev);
- #endif
-
- +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
- +static int astribank_match(struct device *dev, const struct device_driver *driver)
- +#else
- static int astribank_match(struct device *dev, struct device_driver *driver)
- +#endif /* LINUX_VERSION_CODE */
- {
- DBG(DEVICES, "SYSFS MATCH: dev->bus_id = %s, driver->name = %s\n",
- dev_name(dev), driver->name);
- @@ -771,7 +775,11 @@ static DEVICE_ATTR_READER(refcount_xpd_show, dev, buf)
- return len;
- }
-
- +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
- +static int xpd_match(struct device *dev, const struct device_driver *driver)
- +#else
- static int xpd_match(struct device *dev, struct device_driver *driver)
- +#endif /* LINUX_VERSION_CODE */
- {
- struct xpd_driver *xpd_driver;
- xpd_t *xpd;
- --
- 2.39.5
|