diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-03-15 15:04:04 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-03-15 15:04:04 -0700 |
| commit | 57ed9567e63b59350c21ae026635ae051e247abb (patch) | |
| tree | c627d8817df7917f6648c23592ebba438e3273fe /drivers/input/serio | |
| parent | fbf8d71742557abaf558d8efb96742d442720cc2 (diff) | |
| parent | 81c32343d04f8ca974681d5fb5d939d2e1f58851 (diff) | |
| download | linux-next-57ed9567e63b59350c21ae026635ae051e247abb.tar.gz linux-next-57ed9567e63b59350c21ae026635ae051e247abb.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.9 merge window.
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/serio.c | 2 | ||||
| -rw-r--r-- | drivers/input/serio/xilinx_ps2.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 767fc9efb4a8..a8838b522627 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -1007,7 +1007,7 @@ irqreturn_t serio_interrupt(struct serio *serio, } EXPORT_SYMBOL(serio_interrupt); -struct bus_type serio_bus = { +const struct bus_type serio_bus = { .name = "serio", .drv_groups = serio_driver_groups, .match = serio_bus_match, diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index d8f9faf2b529..bb758346a33d 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c @@ -219,8 +219,7 @@ static void sxps2_close(struct serio *pserio) /** * xps2_of_probe - probe method for the PS/2 device. - * @of_dev: pointer to OF device structure - * @match: pointer to the structure used for matching a device + * @ofdev: pointer to OF device structure * * This function probes the PS/2 device in the device tree. * It initializes the driver data structure and the hardware. |