RHEL_RELEASE_VERSION(9, 8) backported xpp, sysfs: Use const struct device_device

[phoneben]

/usr/local/src/dahdi-linux/drivers/dahdi/xpp/xbus-sysfs.c:483:18: error: initialization of ‘int (*)(struct device *, const struct device_driver *)’ from incompatible pointer type ‘int (*)(struct device *, struct device_driver *)’ [-Werror=incompatible-pointer-types]
  483 |         .match = astribank_match,
      |                  ^~~~~~~~~~~~~~~

my fix is in par with #64
adding to all if
||(defined(RHEL_RELEASE_CODE) && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8)))

[rodolfojcj]

On Ubuntu 24.04, Linux kernel 6.17 HWE variant, the compilation of DAHDI linux fails.

I think that is related with the recent commits referred above for the current issue.

These are the final messages and error output I got:

  CC [M]  wcb4xxp/base.o
  LD [M]  wcb4xxp/wcb4xxp.o
  CC [M]  xpp/xbus-core.o
  CC [M]  xpp/xbus-sysfs.o
xpp/xbus-sysfs.c:400:127: error: missing binary operator before token "("
  400 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ||(defined(RHEL_RELEASE_CODE) && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8)))
      |                                                                                                                               ^
xpp/xbus-sysfs.c:483:18: error: initialization of ‘int (*)(struct device *, const struct device_driver *)’ from incompatible pointer type ‘int (*)(struct device *, struct device_driver *)’ [-Werror=incompatible-pointer-types]
  483 |         .match = astribank_match,
      |                  ^~~~~~~~~~~~~~~
xpp/xbus-sysfs.c:483:18: note: (near initialization for ‘toplevel_bus_type.match’)
xpp/xbus-sysfs.c:781:127: error: missing binary operator before token "("
  781 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ||(defined(RHEL_RELEASE_CODE) && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 8)))
      |                                                                                                                               ^
xpp/xbus-sysfs.c:843:18: error: initialization of ‘int (*)(struct device *, const struct device_driver *)’ from incompatible pointer type ‘int (*)(struct device *, struct device_driver *)’ [-Werror=incompatible-pointer-types]
  843 |         .match = xpd_match,
      |                  ^~~~~~~~~
xpp/xbus-sysfs.c:843:18: note: (near initialization for ‘xpd_type.match’)
cc1: some warnings being treated as errors
make[6]: *** [/usr/src/linux-headers-6.17.0-20-generic/scripts/Makefile.build:287: xpp/xbus-sysfs.o] Error 1
make[5]: *** [/usr/src/linux-headers-6.17.0-20-generic/scripts/Makefile.build:556: xpp] Error 2
make[4]: *** [/usr/src/linux-headers-6.17.0-20-generic/Makefile:2016: .] Error 2
make[3]: *** [/usr/src/linux-headers-6.17.0-20-generic/Makefile:248: __sub-make] Error 2
make[3]: Leaving directory '/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/drivers/dahdi'
make[2]: *** [Makefile:248: __sub-make] Error 2
make[2]: Leaving directory '/usr/src/linux-headers-6.17.0-20-generic'
make[1]: *** [Makefile:74: modules] Error 2
make[1]: Leaving directory '/tmp/dahdi-linux-complete-compilation-2026-april-15/linux'
make: *** [Makefile:9: all] Error 2

Distribution is "24.04.4 LTS (Noble Numbat)".
Running Linux kernel is 6.17.0-20.
GCC version is "gcc (Ubuntu 13.3.0-6ubuntu2~24.04.1) 13.3.0".

[InterLinked1]

On Ubuntu 24.04, Linux kernel 6.17 HWE variant, the compilation of DAHDI linux fails.

I think that is related with the recent commits referred above for the current issue.

Yes, it looks like that introduced a syntax error - could you please open a new issue for that? I can put up a patch against that.

[rodolfojcj]

Sure, #108 has been opened for that.

Thank you.

[InterLinked1]

Sure, #108 has been opened for that.

Thank you.

My bad, looks like it's actually just the same issue as this one after all, I thought the whitespace issue might be a thing on its own but I don't think it is.

I take it when you apply this PR, the issue goes away, right?

[rodolfojcj]

May I know which PR do you refer to?

What I did was taking the sources of the most recent commit as of today (e.g d1c842a) and tried running make all, and then my reported error happened.

Best regards.

[InterLinked1]

May I know which PR do you refer to?

What I did was taking the sources of the most recent commit as of today (e.g d1c842a) and tried running make all, and then my reported error happened.

Best regards.

I mean this patch here: https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/106.patch

I think that addresses your issue here and that's not merged yet, just wanted to double check it's the same.

[rodolfojcj]

With that patch applied the compiling failure still happens and at the end I'm getting these output and error lines:

  CC [M]  oct612x/apilib/llman/octapi_llman.o
  CC [M]  oct612x/oct612x-user.o
In file included from oct612x/oct612x-user.c:28:
/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/include/dahdi/kernel.h:66:75: warning: this use of "defined" may not be portable [-Wexpansion-to-defined]
   66 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0) || RHEL_VERSION_GE(9, 8)
      |                                                                           ^
/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/include/dahdi/kernel.h:66:75: warning: this use of "defined" may not be portable [-Wexpansion-to-defined]
/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/include/dahdi/kernel.h:64:52: error: missing binary operator before token "("
   64 |          (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(maj, min)))
      |                                                    ^
/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/include/dahdi/kernel.h:66:55: note: in expansion of macro ‘RHEL_VERSION_GE’
   66 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0) || RHEL_VERSION_GE(9, 8)
      |                                                       ^~~~~~~~~~~~~~~
make[6]: *** [/usr/src/linux-headers-6.17.0-20-generic/scripts/Makefile.build:287: oct612x/oct612x-user.o] Error 1
make[5]: *** [/usr/src/linux-headers-6.17.0-20-generic/scripts/Makefile.build:556: oct612x] Error 2
make[4]: *** [/usr/src/linux-headers-6.17.0-20-generic/Makefile:2016: .] Error 2
make[3]: *** [/usr/src/linux-headers-6.17.0-20-generic/Makefile:248: __sub-make] Error 2
make[3]: Leaving directory '/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/drivers/dahdi'
make[2]: *** [Makefile:248: __sub-make] Error 2
make[2]: Leaving directory '/usr/src/linux-headers-6.17.0-20-generic'
make[1]: *** [Makefile:74: modules] Error 2
make[1]: Leaving directory '/tmp/dahdi-linux-complete-compilation-2026-april-15/linux'
make: *** [Makefile:9: all] Error 2

[InterLinked1]

With that patch applied the compiling failure still happens and at the end I'm getting these output and error lines:

  CC [M]  oct612x/apilib/llman/octapi_llman.o
  CC [M]  oct612x/oct612x-user.o
In file included from oct612x/oct612x-user.c:28:
/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/include/dahdi/kernel.h:66:75: warning: this use of "defined" may not be portable [-Wexpansion-to-defined]
   66 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0) || RHEL_VERSION_GE(9, 8)
      |                                                                           ^
/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/include/dahdi/kernel.h:66:75: warning: this use of "defined" may not be portable [-Wexpansion-to-defined]
/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/include/dahdi/kernel.h:64:52: error: missing binary operator before token "("
   64 |          (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(maj, min)))
      |                                                    ^
/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/include/dahdi/kernel.h:66:55: note: in expansion of macro ‘RHEL_VERSION_GE’
   66 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0) || RHEL_VERSION_GE(9, 8)
      |                                                       ^~~~~~~~~~~~~~~
make[6]: *** [/usr/src/linux-headers-6.17.0-20-generic/scripts/Makefile.build:287: oct612x/oct612x-user.o] Error 1
make[5]: *** [/usr/src/linux-headers-6.17.0-20-generic/scripts/Makefile.build:556: oct612x] Error 2
make[4]: *** [/usr/src/linux-headers-6.17.0-20-generic/Makefile:2016: .] Error 2
make[3]: *** [/usr/src/linux-headers-6.17.0-20-generic/Makefile:248: __sub-make] Error 2
make[3]: Leaving directory '/tmp/dahdi-linux-complete-compilation-2026-april-15/linux/drivers/dahdi'
make[2]: *** [Makefile:248: __sub-make] Error 2
make[2]: Leaving directory '/usr/src/linux-headers-6.17.0-20-generic'
make[1]: *** [Makefile:74: modules] Error 2
make[1]: Leaving directory '/tmp/dahdi-linux-complete-compilation-2026-april-15/linux'
make: *** [Makefile:9: all] Error 2

@phoneben I think this is an issue with your open PR - would you mind taking a look?
My guess is newer versions of gcc don't like the way the RHEL_VERSION_GE macro is defined at the moment.

I kind of wonder if this would cause the same issue:

#if defined(RHEL_RELEASE_CODE) && defined(RHEL_RELEASE_VERSION)
#define RHEL_VERSION_GE(maj, min) (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(maj, min))
#else
#define RHEL_VERSION_GE(maj, min) (0)
#endif