xmm7360: Drop put_tty_driver #152
Merged
+1
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As of v5.15, the `put_tty_driver` alias has been dropped in favor of directly calling `tty_driver_kref_put` (9f90a4ddef4e). Apply this change in the xmm7360 driver in order to allow building on recent kernels. Signed-off-by: Artur Rojek <contact@artur-rojek.eu>
|
This fixes #150 |
13 tasks
flokli
added a commit
to flokli/nixpkgs
that referenced
this pull request
Nov 28, 2021
As of v5.15, the `put_tty_driver` alias has been dropped in favor of directly calling `tty_driver_kref_put` (9f90a4ddef4e). Apply this change in the xmm7360 driver in order to allow building on recent kernels. See xmm7360/xmm7360-pci#152
|
This seems to be broken both on 5.14 and 5.15: |
|
Hi Florian,
On 2021-11-28 14:20, Florian Klink wrote:
This seems to be broken both on 5.14 and 5.15:
make -C
/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/build
M=/build/source modules
make[1]: Entering directory
'/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/build'
CC [M] /build/source/xmm7360.o
/build/source/xmm7360.c:1322:16: error: initialization of 'unsigned
int (*)(struct tty_struct *)' from incompatible pointer type 'int
(*)(struct tty_struct *)'
[8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Werror=incompatible-pointer-types8;;]
1322 | .write_room = xmm7360_tty_write_room,
| ^~~~~~~~~~~~~~~~~~~~~~
This is already fixed in #139
On that note, I also recommend applying
#149 if you want a stable
driver.
Regards,
Artur
… /build/source/xmm7360.c:1322:16: note: (near initialization for
'xmm7360_tty_ops.write_room')
cc1: some warnings being treated as errors
make[3]: ***
[/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/scripts/Makefile.build:271:
/build/source/xmm7360.o] Error 1
make[2]: ***
[/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/Makefile:1858:
/build/source] Error 2
make[1]: ***
[/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/Makefile:220:
__sub-make] Error 2
make[1]: Leaving directory
'/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/build'
make: *** [Makefile:9: default] Error 2
error: builder for
'/nix/store/fsxn9hy9jjgc70qz7vr0468wcwps3pb2-xmm7360-pci-unstable-2021-07-19.drv'
failed with exit code 2;
last 10 log lines:
> /build/source/xmm7360.c:1322:16: error: initialization of
'unsigned int (*)(struct tty_struct *)' from incompatible pointer type
'int (*)(struct tty_struct *)'
[8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Werror=incompatible-pointer-types8;;]
> 1322 | .write_room = xmm7360_tty_write_room,
> | ^~~~~~~~~~~~~~~~~~~~~~
> /build/source/xmm7360.c:1322:16: note: (near initialization
for 'xmm7360_tty_ops.write_room')
> cc1: some warnings being treated as errors
> make[3]: ***
[/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/scripts/Makefile.build:271:
/build/source/xmm7360.o] Error 1
> make[2]: ***
[/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/Makefile:1858:
/build/source] Error 2
> make[1]: ***
[/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/Makefile:220:
__sub-make] Error 2
> make[1]: Leaving directory
'/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/build'
> make: *** [Makefile:9: default] Error 2
For full logs, run 'nix log
/nix/store/fsxn9hy9jjgc70qz7vr0468wcwps3pb2-xmm7360-pci-unstable-2021-07-19.drv'.
build flags:
SHELL=/nix/store/l0wlqpbsvh1pgvhcdhw7qkka3d31si7k-bash-5.1-p8/bin/bash
KDIR=/nix/store/qsw0596gm8zvlv25w9ckz3wrgk59zmbr-linux-5.15.4-dev/lib/modules/5.15.4/build
make -C
/nix/store/qsw0596gm8zvlv25w9ckz3wrgk59zmbr-linux-5.15.4-dev/lib/modules/5.15.4/build
M=/build/source modules
make[1]: Entering directory
'/nix/store/qsw0596gm8zvlv25w9ckz3wrgk59zmbr-linux-5.15.4-dev/lib/modules/5.15.4/build'
CC [M] /build/source/xmm7360.o
/build/source/xmm7360.c:1322:16: error: initialization of 'unsigned
int (*)(struct tty_struct *)' from incompatible pointer type 'int
(*)(struct tty_struct *)'
[8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Werror=incompatible-pointer-types8;;]
1322 | .write_room = xmm7360_tty_write_room,
| ^~~~~~~~~~~~~~~~~~~~~~
/build/source/xmm7360.c:1322:16: note: (near initialization for
'xmm7360_tty_ops.write_room')
cc1: some warnings being treated as errors
make[2]: ***
[/nix/store/qsw0596gm8zvlv25w9ckz3wrgk59zmbr-linux-5.15.4-dev/lib/modules/5.15.4/source/scripts/Makefile.build:277:
/build/source/xmm7360.o] Error 1
make[1]: ***
[/nix/store/qsw0596gm8zvlv25w9ckz3wrgk59zmbr-linux-5.15.4-dev/lib/modules/5.15.4/source/Makefile:1868:
/build/source] Error 2
make[1]: Leaving directory
'/nix/store/qsw0596gm8zvlv25w9ckz3wrgk59zmbr-linux-5.15.4-dev/lib/modules/5.15.4/build'
make: *** [Makefile:9: default] Error 2
error: builder for
'/nix/store/44aswya8v8f9a3g1nabk4n0w4gln8xln-xmm7360-pci-unstable-2021-07-19.drv'
failed with exit code 2;
last 10 log lines:
> CC [M] /build/source/xmm7360.o
> /build/source/xmm7360.c:1322:16: error: initialization of
'unsigned int (*)(struct tty_struct *)' from incompatible pointer type
'int (*)(struct tty_struct *)'
[8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Werror=incompatible-pointer-types8;;]
> 1322 | .write_room = xmm7360_tty_write_room,
> | ^~~~~~~~~~~~~~~~~~~~~~
> /build/source/xmm7360.c:1322:16: note: (near initialization
for 'xmm7360_tty_ops.write_room')
> cc1: some warnings being treated as errors
> make[2]: ***
[/nix/store/qsw0596gm8zvlv25w9ckz3wrgk59zmbr-linux-5.15.4-dev/lib/modules/5.15.4/source/scripts/Makefile.build:277:
/build/source/xmm7360.o] Error 1
> make[1]: ***
[/nix/store/qsw0596gm8zvlv25w9ckz3wrgk59zmbr-linux-5.15.4-dev/lib/modules/5.15.4/source/Makefile:1868:
/build/source] Error 2
> make[1]: Leaving directory
'/nix/store/qsw0596gm8zvlv25w9ckz3wrgk59zmbr-linux-5.15.4-dev/lib/modules/5.15.4/build'
> make: *** [Makefile:9: default] Error 2
For full logs, run 'nix log
/nix/store/44aswya8v8f9a3g1nabk4n0w4gln8xln-xmm7360-pci-unstable-2021-07-19.drv'.
--
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub [1], or unsubscribe
[2].
Triage notifications on the go with GitHub Mobile for iOS [3] or
Android [4].
Links:
------
[1]
#152 (comment)
[2]
https://github.com/notifications/unsubscribe-auth/AAD4VMYEBOVA3X7O2SE5MXTUOIUB3ANCNFSM5IOBFLJA
[3]
https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675
[4]
https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub
|
flokli
added a commit
to flokli/nixpkgs
that referenced
this pull request
Dec 2, 2021
As of v5.15, the `put_tty_driver` alias has been dropped in favor of directly calling `tty_driver_kref_put` (9f90a4ddef4e). Apply this change in the xmm7360 driver in order to allow building on recent kernels: xmm7360/xmm7360-pci#152 Also, apply some [incompatible pointer type fixes](xmm7360/xmm7360-pci#139) and [stability fixes](xmm7360/xmm7360-pci#149) which are queued in that repository. I successfully built this for 5.14 and 5.15, so let's remove the isBroken for these versions.
13 tasks
|
Similar changes to #159 |
|
No, his change is similar to mine, as my patch was first. |
OK, Their change also includes a check for !139 gives me the same compile issue so I can't apply that without the kernel version check |
|
That said, this change works with no issues for me. |
Which is unnecessary, because |
|
Yeah, I see; I agree, your patch for the My issue was that if we need #139 for this change to work on 5.15, based on the comment above; and that pull isn't working right for me. |
|
You're welcome. Glad that my changes are merged now, so there will be no further confusion in the pull requests :) PS. Is there any faster way of communication with you and other maintainers of this driver, perhaps via e-mail or IRC? I'd like to help with the cleanup and upstream process of this driver, as I'm forced to use LTE on a compatible device on a daily basis. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As of v5.15, the
put_tty_driveralias has been dropped in favor ofdirectly calling
tty_driver_kref_put(9f90a4ddef4e). Apply this changein the xmm7360 driver in order to allow building on recent kernels.
Signed-off-by: Artur Rojek contact@artur-rojek.eu