Skip to content

Commit fb2536a

Browse files
committed
#454 Updated mock driver for latest ubuntu 24 kernel
1 parent 602deab commit fb2536a

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

plugins/pi4j-plugin-ffm/src/test/native/spi-mock.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <linux/platform_device.h>
1111

12-
static struct spi_master *master;
12+
static struct spi_controller *master;
1313
static struct spi_device *spi_dev;
1414

1515
static int myspi_transfer_one(struct spi_controller *ctlr, struct spi_device *spi,
@@ -48,7 +48,7 @@
4848

4949
pr_info("%s()\n", __func__);
5050

51-
master = spi_alloc_master(&pdev->dev, 0);
51+
master = spi_alloc_host(&pdev->dev, 0);
5252

5353
if (master == NULL) {
5454
pr_err("spi_alloc_master failed\n");
@@ -59,11 +59,11 @@
5959

6060
master->transfer_one = myspi_transfer_one;
6161

62-
err = spi_register_master(master);
62+
err = spi_register_controller(master);
6363

6464
if (err) {
6565
pr_err("spi_register_master failed\n");
66-
spi_master_put(master);
66+
//spi_dev_put(master);
6767
return err;
6868
}
6969

@@ -81,13 +81,12 @@
8181
return err;
8282
}
8383

84-
static int plat_remove(struct platform_device *pdev)
84+
static void plat_remove(struct platform_device *pdev)
8585
{
8686
pr_info("%s()\n", __func__);
8787

88-
spi_unregister_master(master);
88+
spi_unregister_controller(master);
8989

90-
return 0;
9190
}
9291

9392
static struct platform_device * plat_device;
Binary file not shown.

0 commit comments

Comments
 (0)