Skip to content

Commit 69c9f23

Browse files
committed
Merge tag 'hsi-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel: - fix build warning with W=1 - drop error handling for debugfs * tag 'hsi-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi: HSI: omap_ssi_port: Drop error checking for debugfs_create_dir HSI: fix ssi_waketest() declaration
2 parents 0df2413 + 42877c3 commit 69c9f23

4 files changed

Lines changed: 4 additions & 14 deletions

File tree

drivers/hsi/clients/ssi_protocol.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
#include <linux/hsi/hsi.h>
3333
#include <linux/hsi/ssi_protocol.h>
3434

35-
void ssi_waketest(struct hsi_client *cl, unsigned int enable);
36-
3735
#define SSIP_TXQUEUE_LEN 100
3836
#define SSIP_MAX_MTU 65535
3937
#define SSIP_DEFAULT_MTU 4000

drivers/hsi/controllers/omap_ssi_core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/dma-mapping.h>
1818
#include <linux/dmaengine.h>
1919
#include <linux/delay.h>
20+
#include <linux/hsi/ssi_protocol.h>
2021
#include <linux/seq_file.h>
2122
#include <linux/scatterlist.h>
2223
#include <linux/interrupt.h>

drivers/hsi/controllers/omap_ssi_port.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,23 +151,17 @@ static int ssi_div_set(void *data, u64 val)
151151

152152
DEFINE_DEBUGFS_ATTRIBUTE(ssi_sst_div_fops, ssi_div_get, ssi_div_set, "%llu\n");
153153

154-
static int ssi_debug_add_port(struct omap_ssi_port *omap_port,
154+
static void ssi_debug_add_port(struct omap_ssi_port *omap_port,
155155
struct dentry *dir)
156156
{
157157
struct hsi_port *port = to_hsi_port(omap_port->dev);
158158

159159
dir = debugfs_create_dir(dev_name(omap_port->dev), dir);
160-
if (!dir)
161-
return -ENOMEM;
162160
omap_port->dir = dir;
163161
debugfs_create_file("regs", S_IRUGO, dir, port, &ssi_port_regs_fops);
164162
dir = debugfs_create_dir("sst", dir);
165-
if (!dir)
166-
return -ENOMEM;
167163
debugfs_create_file_unsafe("divisor", 0644, dir, port,
168164
&ssi_sst_div_fops);
169-
170-
return 0;
171165
}
172166
#endif
173167

@@ -1217,11 +1211,7 @@ static int ssi_port_probe(struct platform_device *pd)
12171211
pm_runtime_enable(omap_port->pdev);
12181212

12191213
#ifdef CONFIG_DEBUG_FS
1220-
err = ssi_debug_add_port(omap_port, omap_ssi->dir);
1221-
if (err < 0) {
1222-
pm_runtime_disable(omap_port->pdev);
1223-
goto error;
1224-
}
1214+
ssi_debug_add_port(omap_port, omap_ssi->dir);
12251215
#endif
12261216

12271217
hsi_add_clients_from_dt(port, np);

include/linux/hsi/ssi_protocol.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ int ssip_slave_stop_tx(struct hsi_client *master);
2424
void ssip_reset_event(struct hsi_client *master);
2525

2626
int ssip_slave_running(struct hsi_client *master);
27+
void ssi_waketest(struct hsi_client *cl, unsigned int enable);
2728

2829
#endif /* __LINUX_SSIP_SLAVE_H__ */
2930

0 commit comments

Comments
 (0)