ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'hsi-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Browse Source 
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
This commit is contained in:
Linus Torvalds
2023-07-03 17:31:36 -07:00
parent 0df241385b 42877c38ac
commit 69c9f23070
4 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hsi/clients/ssi_protocol.c
View File

@@ -32,8 +32,6 @@
#include <linux/hsi/hsi.h> #include <linux/hsi/hsi.h>
#include <linux/hsi/ssi_protocol.h> #include <linux/hsi/ssi_protocol.h>
void ssi_waketest(struct hsi_client *cl, unsigned int enable);
#define SSIP_TXQUEUE_LEN 100 #define SSIP_TXQUEUE_LEN 100
#define SSIP_MAX_MTU 65535 #define SSIP_MAX_MTU 65535
#define SSIP_DEFAULT_MTU 4000 #define SSIP_DEFAULT_MTU 4000

1
drivers/hsi/controllers/omap_ssi_core.c
View File

@@ -17,6 +17,7 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/hsi/ssi_protocol.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>

14
drivers/hsi/controllers/omap_ssi_port.c
View File

@@ -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"); 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 dentry *dir)
{ {
struct hsi_port *port = to_hsi_port(omap_port->dev); struct hsi_port *port = to_hsi_port(omap_port->dev);
dir = debugfs_create_dir(dev_name(omap_port->dev), dir); dir = debugfs_create_dir(dev_name(omap_port->dev), dir);
if (!dir)
return -ENOMEM;
omap_port->dir = dir; omap_port->dir = dir;
debugfs_create_file("regs", S_IRUGO, dir, port, &ssi_port_regs_fops); debugfs_create_file("regs", S_IRUGO, dir, port, &ssi_port_regs_fops);
dir = debugfs_create_dir("sst", dir); dir = debugfs_create_dir("sst", dir);
if (!dir)
return -ENOMEM;
debugfs_create_file_unsafe("divisor", 0644, dir, port, debugfs_create_file_unsafe("divisor", 0644, dir, port,
&ssi_sst_div_fops); &ssi_sst_div_fops);
return 0;
} }
#endif #endif
@@ -1217,11 +1211,7 @@ static int ssi_port_probe(struct platform_device *pd)
pm_runtime_enable(omap_port->pdev); pm_runtime_enable(omap_port->pdev);
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
err = ssi_debug_add_port(omap_port, omap_ssi->dir); ssi_debug_add_port(omap_port, omap_ssi->dir);
if (err < 0) {
pm_runtime_disable(omap_port->pdev);
goto error;
}
#endif #endif
hsi_add_clients_from_dt(port, np); hsi_add_clients_from_dt(port, np);

1
include/linux/hsi/ssi_protocol.h
View File

@@ -24,6 +24,7 @@ int ssip_slave_stop_tx(struct hsi_client *master);
void ssip_reset_event(struct hsi_client *master); void ssip_reset_event(struct hsi_client *master);
int ssip_slave_running(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__ */ #endif /* __LINUX_SSIP_SLAVE_H__ */