diff --git a/.github/workflows/driver-cross-build.yml b/.github/workflows/driver-cross-build.yml index d60ee4c..70113a1 100644 --- a/.github/workflows/driver-cross-build.yml +++ b/.github/workflows/driver-cross-build.yml @@ -36,12 +36,6 @@ jobs: fail-fast: false matrix: env: - # Debian 10 (Buster) - - { HOST: 20.04, KERNEL_VER: rpi-5.4.y, OS_BIT: armhf, RASPI: 3} - - { HOST: 20.04, KERNEL_VER: rpi-5.4.y, OS_BIT: armhf, RASPI: 4} - # Debian 11 (Bullseye) - - { HOST: 20.04, KERNEL_VER: rpi-5.10.y, OS_BIT: armhf, RASPI: 3} - - { HOST: 20.04, KERNEL_VER: rpi-5.10.y, OS_BIT: armhf, RASPI: 4} # Debian 11 (Bullseye) - { HOST: 22.04, KERNEL_VER: rpi-5.15.y, OS_BIT: armhf, RASPI: 3} - { HOST: 22.04, KERNEL_VER: rpi-5.15.y, OS_BIT: armhf, RASPI: 4} diff --git a/src/drivers/rtmouse_dev.c b/src/drivers/rtmouse_dev.c index 1146b14..dd20efb 100644 --- a/src/drivers/rtmouse_dev.c +++ b/src/drivers/rtmouse_dev.c @@ -189,7 +189,7 @@ static unsigned int mcp3204_get_value(int channel) dev = mcp320x_dev; #else - struct spi_master *master; + struct spi_controller *master; master = spi_busnum_to_master(mcp3204_info.bus_num); snprintf(str, sizeof(str), "%s.%u", dev_name(&master->dev), mcp3204_info.chip_select); diff --git a/src/drivers/rtmouse_spi.c b/src/drivers/rtmouse_spi.c index e5f8db2..4f2e60e 100644 --- a/src/drivers/rtmouse_spi.c +++ b/src/drivers/rtmouse_spi.c @@ -148,7 +148,7 @@ static int mcp3204_probe(struct spi_device *spi) * spi_remove_device - remove SPI device * called by mcp3204_init() and mcp3204_exit() */ -static void spi_remove_device(struct spi_master *master, unsigned int cs) +static void spi_remove_device(struct spi_controller *master, unsigned int cs) { struct device *dev; char str[128]; @@ -188,7 +188,7 @@ int mcp3204_init(void) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0) bus_for_each_dev(&spi_bus_type, NULL, NULL, __callback_find_mcp3204); #else - struct spi_master *master; + struct spi_controller *master; struct spi_device *spi_device; spi_register_driver(&mcp3204_driver); @@ -231,7 +231,7 @@ void mcp3204_exit(void) mcp3204_remove(to_spi_device(mcp320x_dev)); } #else - struct spi_master *master; + struct spi_controller *master; master = spi_busnum_to_master(mcp3204_info.bus_num); if (master) {