diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-03 17:31:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-03 17:31:36 -0700 |
| commit | 69c9f23070f8b4651b17557a0108d07b87437ede (patch) | |
| tree | ac6c6f8ffaf2f91a2b863984fa172dd2c159db88 | |
| parent | 0df241385b69616f5d7d41824348528b189ffd01 (diff) | |
| parent | 42877c38ac78e456fd9e149842a96a3576fb36e5 (diff) | |
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
| -rw-r--r-- | drivers/hsi/clients/ssi_protocol.c | 2 | ||||
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_core.c | 1 | ||||
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_port.c | 14 | ||||
| -rw-r--r-- | include/linux/hsi/ssi_protocol.h | 1 |
4 files changed, 4 insertions, 14 deletions
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c index 38e572faff43..da6a7abd584f 100644 --- a/drivers/hsi/clients/ssi_protocol.c +++ b/drivers/hsi/clients/ssi_protocol.c @@ -32,8 +32,6 @@ #include <linux/hsi/hsi.h> #include <linux/hsi/ssi_protocol.h> -void ssi_waketest(struct hsi_client *cl, unsigned int enable); - #define SSIP_TXQUEUE_LEN 100 #define SSIP_MAX_MTU 65535 #define SSIP_DEFAULT_MTU 4000 diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c index 26f2c3c01297..84ba8b875199 100644 --- a/drivers/hsi/controllers/omap_ssi_core.c +++ b/drivers/hsi/controllers/omap_ssi_core.c @@ -17,6 +17,7 @@ #include <linux/dma-mapping.h> #include <linux/dmaengine.h> #include <linux/delay.h> +#include <linux/hsi/ssi_protocol.h> #include <linux/seq_file.h> #include <linux/scatterlist.h> #include <linux/interrupt.h> diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c index b9495b720f1b..c78d9c9f7371 100644 --- a/drivers/hsi/controllers/omap_ssi_port.c +++ b/drivers/hsi/controllers/omap_ssi_port.c @@ -151,23 +151,17 @@ static int ssi_div_set(void *data, u64 val) DEFINE_DEBUGFS_ATTRIBUTE(ssi_sst_div_fops, ssi_div_get, ssi_div_set, "%llu\n"); -static int ssi_debug_add_port(struct omap_ssi_port *omap_port, +static void ssi_debug_add_port(struct omap_ssi_port *omap_port, struct dentry *dir) { struct hsi_port *port = to_hsi_port(omap_port->dev); dir = debugfs_create_dir(dev_name(omap_port->dev), dir); - if (!dir) - return -ENOMEM; omap_port->dir = dir; debugfs_create_file("regs", S_IRUGO, dir, port, &ssi_port_regs_fops); dir = debugfs_create_dir("sst", dir); - if (!dir) - return -ENOMEM; debugfs_create_file_unsafe("divisor", 0644, dir, port, &ssi_sst_div_fops); - - return 0; } #endif @@ -1217,11 +1211,7 @@ static int ssi_port_probe(struct platform_device *pd) pm_runtime_enable(omap_port->pdev); #ifdef CONFIG_DEBUG_FS - err = ssi_debug_add_port(omap_port, omap_ssi->dir); - if (err < 0) { - pm_runtime_disable(omap_port->pdev); - goto error; - } + ssi_debug_add_port(omap_port, omap_ssi->dir); #endif hsi_add_clients_from_dt(port, np); diff --git a/include/linux/hsi/ssi_protocol.h b/include/linux/hsi/ssi_protocol.h index 2d6f3cfa7dea..972434daa000 100644 --- a/include/linux/hsi/ssi_protocol.h +++ b/include/linux/hsi/ssi_protocol.h @@ -24,6 +24,7 @@ int ssip_slave_stop_tx(struct hsi_client *master); void ssip_reset_event(struct hsi_client *master); int ssip_slave_running(struct hsi_client *master); +void ssi_waketest(struct hsi_client *cl, unsigned int enable); #endif /* __LINUX_SSIP_SLAVE_H__ */ |