Skip to content

Commit d1f0c94

Browse files
committed
misc: rp1-pio: Back-port some 6.11 build fixes
Porting rp1-pio to rpi-6.11.y uncovered a few missing #includes and a difference of const-ness. Although not needed here, back-porting the resulting changes makes the driver more "correct" and may prevent a future merge conflict. Signed-off-by: Phil Elwell <[email protected]>
1 parent df8a2f6 commit d1f0c94

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/misc/rp1-pio.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
#include <linux/init.h>
2323
#include <linux/ioctl.h>
2424
#include <linux/module.h>
25+
#include <linux/of.h>
26+
#include <linux/pio_rp1.h>
27+
#include <linux/platform_device.h>
2528
#include <linux/rp1-firmware.h>
2629
#include <linux/semaphore.h>
2730
#include <linux/slab.h>

include/linux/pio_rp1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ typedef rp1_pio_sm_config pio_sm_config;
176176
typedef struct rp1_pio_client *PIO;
177177

178178
void pio_set_error(struct rp1_pio_client *client, int err);
179-
int pio_get_error(struct rp1_pio_client *client);
179+
int pio_get_error(const struct rp1_pio_client *client);
180180
void pio_clear_error(struct rp1_pio_client *client);
181181

182182
int rp1_pio_can_add_program(struct rp1_pio_client *client, void *param);

0 commit comments

Comments
 (0)