削除されたマクロ"spi_master"を"spi_controller"に置き換え

Author: KuraZuzu

src/drivers/rtmouse.h

@@ -52,7 +52,7 @@
 // Raspberry Pi 2 B        : 2
 // Raspberry Pi 3 B/A+/B+  : 2
 // Raspberry Pi 4 B        : 4
-#define RASPBERRYPI 2
+#define RASPBERRYPI 4
 
 #define DEV_RIGHT 0
 #define DEV_LEFT 1

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 *controller;
 	master = spi_busnum_to_master(mcp3204_info.bus_num);
 	snprintf(str, sizeof(str), "%s.%u", dev_name(&master->dev),
 		 mcp3204_info.chip_select);

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) {