hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HSI changes for the 4.18 series 

* omap-ssi: use DEFINE_SHOW_ATTRIBUTE
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAlwlTqYACgkQ2O7X88g7
 +pqJIA//X5E87epoT9H8vuCLe7SrO2jgFTSnD6styFfCZsOprZpeBIX7J8fqDrde
 U+4yoXW7trPV8nlEiHtNbywBwlTulKaptEc5G1r+6K89KQmkHFkWrz72D3t4/K5u
 wwzvMmopNpY5j1dgkZkLas9T3FPTxELN6oXt34Lh+hGAm1XiFKG1m708Lt+jwsKl
 1QA3yeMhYONdM+LdVkylkt1ddeqfoW0XiD2hD9lVX3+lZqeHL3bAXKhKsh4tzKUl
 //2KQLwlNhWevfHUs1J0bjoLlNQPEvO/R3QmmmxVhoPFDGbx6hNUDsVQd1Bs4LGf
 N+pt/QkULJIe7FZqRsZRnkUyCA72p38/YNtjTfOJ7LQaMYWtp5ns6QM+05w4seIw
 hneIESUBWvElblgN2k12WXsC3ku+125jLc48NQ95KKG6y7gEAOjzEW5usoegEhfm
 eNtLVAQFgaoOac9QhTfJ7dKyDn04SqwZqa/+zi8kmPHJx7ypSn2svv5CORrcxZoS
 fZq1Qlc9myXzEIuTpPtWTunXtPqp5/poOj2eSwd7kiczPPrJdpT1q40Ygt6piaa/
 g99mmDr8HxK+7bpM6tpuiWg1tJqNRYq/xYqYydBLdKjJsE2g0A/+TzYssbpiaUB4
 jyJX1xWNKIR31MF3wRc03bisrtHt8gH4NRIenZyxYCOKohW6Zm8=
 =0vE4
 -----END PGP SIGNATURE-----

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

Pull HSI update from Sebastian Reichel:
 "omap-ssi: use DEFINE_SHOW_ATTRIBUTE"

* tag 'hsi-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: omap_ssi: Change to use DEFINE_SHOW_ATTRIBUTE macro
This commit is contained in:
Linus Torvalds 2018-12-28 20:28:25 -08:00
parent 579a700359 3a658e09a2
commit 4d6ad6fba6
2 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@
static DEFINE_IDA(platform_omap_ssi_ida);
#ifdef CONFIG_DEBUG_FS
static int ssi_debug_show(struct seq_file *m, void *p __maybe_unused)
static int ssi_regs_show(struct seq_file *m, void *p __maybe_unused)
{
struct hsi_controller *ssi = m->private;
struct omap_ssi_controller *omap_ssi = hsi_controller_drvdata(ssi);
@ -63,7 +63,7 @@ static int ssi_debug_show(struct seq_file *m, void *p __maybe_unused)
return 0;
}
static int ssi_debug_gdd_show(struct seq_file *m, void *p __maybe_unused)
static int ssi_gdd_regs_show(struct seq_file *m, void *p __maybe_unused)
{
struct hsi_controller *ssi = m->private;
struct omap_ssi_controller *omap_ssi = hsi_controller_drvdata(ssi);
@ -117,29 +117,8 @@ static int ssi_debug_gdd_show(struct seq_file *m, void *p __maybe_unused)
return 0;
}
static int ssi_regs_open(struct inode *inode, struct file *file)
{
return single_open(file, ssi_debug_show, inode->i_private);
}
static int ssi_gdd_regs_open(struct inode *inode, struct file *file)
{
return single_open(file, ssi_debug_gdd_show, inode->i_private);
}
static const struct file_operations ssi_regs_fops = {
.open = ssi_regs_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static const struct file_operations ssi_gdd_regs_fops = {
.open = ssi_gdd_regs_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
DEFINE_SHOW_ATTRIBUTE(ssi_regs);
DEFINE_SHOW_ATTRIBUTE(ssi_gdd_regs);
static int ssi_debug_add_ctrl(struct hsi_controller *ssi)
{

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

@ -57,7 +57,7 @@ static void ssi_debug_remove_port(struct hsi_port *port)
debugfs_remove_recursive(omap_port->dir);
}
static int ssi_debug_port_show(struct seq_file *m, void *p __maybe_unused)
static int ssi_port_regs_show(struct seq_file *m, void *p __maybe_unused)
{
struct hsi_port *port = m->private;
struct omap_ssi_port *omap_port = hsi_port_drvdata(port);
@ -132,17 +132,7 @@ static int ssi_debug_port_show(struct seq_file *m, void *p __maybe_unused)
return 0;
}
static int ssi_port_regs_open(struct inode *inode, struct file *file)
{
return single_open(file, ssi_debug_port_show, inode->i_private);
}
static const struct file_operations ssi_port_regs_fops = {
.open = ssi_port_regs_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
DEFINE_SHOW_ATTRIBUTE(ssi_port_regs);
static int ssi_div_get(void *data, u64 *val)
{