HSI changes for the 6.5 series
* fix build warning with W=1 * drop error handling for debugfs -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAmSjNiwACgkQ2O7X88g7 +pqm8g//RrdSS4y4RK0qOY5uQ/A6EarlCZab01bA/ZVAcyt5gTjjO9vAjgWDDH39 vm02D+dPs5qbFPyuESvx3TRI7STUfe5H1kQT7A6T0GtJ3CO1soQShf66tmHOzGvu dj+FE1LDNlBQXgPn/IrG69Mf2cjlR28Y+AkV0Pgu+/VPKWxVEyPsfaLY8dXQJ+p3 a3yXcPi7wn3S4pBq26gYOYU74uRjwYTVItR9oVR2RvTY6VRjddunL3jn0aw7S+ns x+tFjqVLtf2kl9TR6ilTztqON6YsgqGzawJbNEm0pB+M8X+zS2JiSAYOfEFwX665 vSNbxQhks/tnO7vHVp5z10LaJlqc78iz26El7QHqmrFeH4CC78udPRHg59du6wzY wt9ZCEtlZ5s8CyZE8kahLGDlwV1l8qsnQm+BJnQgX09E0rxpjRh1jF7jsRf0zBLb pdJfoSvSVluTiZP0oungp1Ahx4Oy7rKCfsLRXNaINemyzgjjNXpj76EHxTHMXVDt Bmz2yU0EbB17+gwt47QOUZLQ890n5E8MKp06fF8i3ZC7FPeotzPblC8Mdg+sGncH 82/W2souAIEBcAypA7rsN5eljveQ1jwd+O89hPTcJeX2qO7Z9Mjv8KpEr4Xlx43V 1cLHFUFyKNsy7AT4DdcD4XpUm5ONdikoEUl0lOLIU7t5kCZFfkA= =nBDw -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
69c9f23070
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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__ */
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче