From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit 0096d223f78cb48db1ae8ae9fd56d702896ba8ae which is commit 150e792dee9ca8416f3d375e48f2f4d7f701fc6b upstream. It breaks the build and shouldn't be here, it was applied to make a follow-up one apply easier. Reported-by: Dominique Martinet <asmadeus@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/Zs6hwNxk7QkCe7AW@xxxxxxxxxxxxx Cc: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20230920125829.1478827-37-u.kleine-koenig@xxxxxxxxxxxxxx Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> Cc: Sasha Levin <sashal@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/input/serio/ioc3kbd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/input/serio/ioc3kbd.c +++ b/drivers/input/serio/ioc3kbd.c @@ -190,7 +190,7 @@ static int ioc3kbd_probe(struct platform return 0; } -static void ioc3kbd_remove(struct platform_device *pdev) +static int ioc3kbd_remove(struct platform_device *pdev) { struct ioc3kbd_data *d = platform_get_drvdata(pdev); @@ -198,6 +198,8 @@ static void ioc3kbd_remove(struct platfo serio_unregister_port(d->kbd); serio_unregister_port(d->aux); + + return 0; } static const struct platform_device_id ioc3kbd_id_table[] = { @@ -208,7 +210,7 @@ MODULE_DEVICE_TABLE(platform, ioc3kbd_id static struct platform_driver ioc3kbd_driver = { .probe = ioc3kbd_probe, - .remove_new = ioc3kbd_remove, + .remove = ioc3kbd_remove, .id_table = ioc3kbd_id_table, .driver = { .name = "ioc3-kbd", Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are queue-5.10/drm-amdgpu-using-uninitialized-value-size-when-calling-amdgpu_vce_cs_reloc.patch queue-5.10/nfsd-don-t-call-freezable_schedule_timeout-after-each-successful-page-allocation-in-svc_alloc_arg.patch queue-5.10/xhci-fix-panther-point-null-pointer-deref-at-full-speed-re-enumeration.patch queue-5.10/input-mt-limit-max-slots.patch queue-5.10/tools-move-alignment-related-macros-to-new-linux-align.h.patch queue-5.10/bitmap-introduce-generic-optimized-bitmap_size.patch queue-5.10/usb-gadget-fsl-increase-size-of-name-buffer-for-endp.patch queue-5.10/s390-dasd-fix-error-recovery-leading-to-data-corruption-on-ese-devices.patch queue-5.10/fuse-initialize-beyond-eof-page-contents-before-setting-uptodate.patch queue-5.10/usb-dwc3-core-skip-setting-event-buffers-for-host-on.patch queue-5.10/staging-ks7010-disable-bh-on-tx_dev_lock.patch queue-5.10/selinux-fix-potential-counting-error-in-avc_add_xperms_decision.patch queue-5.10/vfs-don-t-evict-inode-under-the-inode-lru-traversing-context.patch queue-5.10/fix-bitmap-corruption-on-close_range-with-close_range_unshare.patch queue-5.10/net-rds-fix-possible-deadlock-in-rds_message_put.patch queue-5.10/dm-resume-don-t-return-einval-when-signalled.patch queue-5.10/pinctrl-single-fix-potential-null-dereference-in-pcs_get_function.patch queue-5.10/pinctrl-rockchip-correct-rk3328-iomux-width-flag-for-gpio2-b-pins.patch queue-5.10/kvm-arm64-make-icc_-sgi-_el1-undef-in-the-absence-of-a-vgicv3.patch queue-5.10/drm-amdgpu-jpeg2-properly-set-atomics-vmid-field.patch queue-5.10/btrfs-tree-checker-add-dev-extent-item-checks.patch queue-5.10/media-uvcvideo-fix-integer-overflow-calculating-timestamp.patch queue-5.10/bluetooth-mgmt-add-error-handling-to-pair_device.patch queue-5.10/kvm-arm64-don-t-use-cbz-adr-with-external-symbols.patch queue-5.10/gtp-pull-network-headers-in-gtp_dev_xmit.patch queue-5.10/media-solo6x10-replace-max-a-min-b-c-by-clamp-b-a-c.patch queue-5.10/block-use-unsigned-long-for-blk_validate_block_size.patch queue-5.10/ata-libata-core-fix-null-pointer-dereference-on-error.patch queue-5.10/memcg_write_event_control-fix-a-user-triggerable-oops.patch queue-5.10/revert-drm-amd-display-validate-hw_points_num-before-using-it.patch queue-5.10/hid-wacom-defer-calculation-of-resolution-until-resolution_code-is-known.patch queue-5.10/arm64-acpi-numa-initialize-all-values-of-acpi_early_node_map-to-numa_no_node.patch queue-5.10/binfmt_misc-pass-binfmt_misc-flags-to-the-interpreter.patch queue-5.10/mips-loongson64-set-timer-mode-in-cpu-probe.patch queue-5.10/alsa-timer-relax-start-tick-time-check-for-slave-timer-elements.patch queue-5.10/alsa-usb-audio-support-yamaha-p-125-quirk-entry.patch queue-5.10/cxgb4-add-forgotten-u64-ivlan-cast-before-shift.patch queue-5.10/revert-input-ioc3kbd-convert-to-platform-remove-callback-returning-void.patch queue-5.10/wifi-mwifiex-duplicate-static-structs-used-in-driver-instances.patch queue-5.10/cgroup-cpuset-prevent-uaf-in-proc_cpuset_show.patch queue-5.10/hid-microsoft-add-rumble-support-to-latest-xbox-controllers.patch queue-5.10/bluetooth-hci_ldisc-check-hci_uart_proto_ready-flag-in-hciuartgetproto.patch queue-5.10/btrfs-rename-bitmap_set_bits-btrfs_bitmap_set_bits.patch queue-5.10/mmc-dw_mmc-allow-biu-and-ciu-clocks-to-defer.patch queue-5.10/mptcp-sched-check-both-backup-in-retrans.patch queue-5.10/ipc-replace-costly-bailout-check-in-sysvipc_find_ipc.patch queue-5.10/s390-cio-rename-bitmap_size-idset_bitmap_size.patch queue-5.10/drm-amdgpu-actually-check-flags-for-all-context-ops.patch queue-5.10/dm-persistent-data-fix-memory-allocation-failure.patch queue-5.10/thunderbolt-mark-xdomain-as-unplugged-when-router-is-removed.patch queue-5.10/drm-amdkfd-don-t-allow-mapping-the-mmio-hdp-page-with-large-pages.patch
