seq_file: Introduce DEFINE_SHOW_ATTRIBUTE() helper macro
Subsystems (5)
PATCH 1/4 seq_file: Introduce DEFINE_SHOW_ATTRIBUTE() helper macro
The DEFINE_SHOW_ATTRIBUTE() helper macro would be useful for current users, which are many of them, and for new comers to decrease code duplication.
--- drivers/mfd/ab8500-debugfs.c | 14 -------------- drivers/platform/x86/pmc_atom.c | 14 -------------- include/linux/seq_file.h | 14 ++++++++++++++ net/bluetooth/hci_debugfs.c | 13 ------------- 4 files changed, 14 insertions(+), 41 deletions(-)
drivers/mfd/ab8500-debugfs.c +0 -14
@@ -1258,20 +1258,6 @@ static struct ab8500_prcmu_ranges ab8540_debug_ranges[AB8500_NUM_BANKS] = { }, }; -#define DEFINE_SHOW_ATTRIBUTE (__name) \ -static int __name ## _open(struct inode *inode, struct file *file) \ -{ \ - return single_open(file, __name ## _show, inode->i_private); \ -} \ - \ -static const struct file_operations __name ## _fops = { \ - .owner = THIS_MODULE, \ - .open = __name ## _open, \ - .read = seq_read, \ - .llseek = seq_lseek, \ - .release = single_release, \ -} \ -static irqreturn_t ab8500_debug_handler (int irq,void *data) {char buf[16 ];
drivers/platform/x86/pmc_atom.c +0 -14
@@ -208,20 +208,6 @@ static const struct pmc_data cht_data = { .clks = cht_clks, }; -#define DEFINE_SHOW_ATTRIBUTE (__name) \ -static int __name ## _open(struct inode *inode, struct file *file) \ -{ \ - return single_open(file, __name ## _show, inode->i_private); \ -} \ - \ -static const struct file_operations __name ## _fops = { \ - .owner = THIS_MODULE, \ - .open = __name ## _open, \ - .read = seq_read, \ - .llseek = seq_lseek, \ - .release = single_release, \ -} -static inline u32 pmc_reg_read (struct pmc_dev *pmc,int reg_offset) {return readl (pmc->regmap + reg_offset);
include/linux/seq_file.h +14 -0
@@ -147,6 +147,20 @@ void *__seq_open_private(struct file *, const struct seq_operations *, int);int seq_open_private (struct file *,const struct seq_operations *,int );int seq_release_private (struct inode *,struct file *); +#define DEFINE_SHOW_ATTRIBUTE (__name) \ +static int __name ## _open(struct inode *inode, struct file *file) \ +{ \ + return single_open(file, __name ## _show, inode->i_private); \ +} \ + \ +static const struct file_operations __name ## _fops = { \ + .owner = THIS_MODULE, \ + .open = __name ## _open, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ +} +static inline struct user_namespace *seq_user_ns (struct seq_file *seq) {#ifdef CONFIG_USER_NS
net/bluetooth/hci_debugfs.c +0 -13
@@ -90,19 +90,6 @@ static int __name ## _show(struct seq_file *f, void *ptr) \ \DEFINE_SHOW_ATTRIBUTE (__name) -#define DEFINE_SHOW_ATTRIBUTE (__name) \ -static int __name ## _open(struct inode *inode, struct file *file) \ -{ \ - return single_open(file, __name ## _show, inode->i_private); \ -} \ - \ -static const struct file_operations __name ## _fops = { \ - .open = __name ## _open, \ - .read = seq_read, \ - .llseek = seq_lseek, \ - .release = single_release, \ -} \ - static int features_show(struct seq_file *f, void *ptr) {struct hci_dev *hdev = f->private;
Signature · 1 line
2.15.1
PATCH 2/4 platform/x86: dell-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
...instead of open coding file operations followed by custom ->open() callbacks per each attribute.
--- drivers/platform/x86/dell-laptop.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
drivers/platform/x86/dell-laptop.c +1 -13
@@ -594,19 +594,7 @@ static int dell_debugfs_show(struct seq_file *s, void *data)return 0 ; } - -static int dell_debugfs_open (struct inode *inode,struct file *file) -{ -return single_open (file, dell_debugfs_show, inode->i_private); -} - -static const struct file_operations dell_debugfs_fops = { - .owner =THIS_MODULE , - .open = dell_debugfs_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE (dell_debugfs);static void dell_update_rfkill (struct work_struct *ignored) {
Signature · 1 line
2.15.1
PATCH 3/4 platform/x86: ideapad-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
In reply to Andy Shevchenko...instead of open coding file operations followed by custom ->open() callbacks per each attribute.
--- drivers/platform/x86/ideapad-laptop.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-)
drivers/platform/x86/ideapad-laptop.c +2 -26
@@ -284,19 +284,7 @@ static int debugfs_status_show(struct seq_file *s, void *data)return 0 ; } - -static int debugfs_status_open (struct inode *inode,struct file *file) -{ -return single_open (file, debugfs_status_show, inode->i_private); -} - -static const struct file_operations debugfs_status_fops = { - .owner =THIS_MODULE , - .open = debugfs_status_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE (debugfs_status);static int debugfs_cfg_show (struct seq_file *s,void *data) {
@@ -337,19 +325,7 @@ static int debugfs_cfg_show(struct seq_file *s, void *data) }return 0 ; } - -static int debugfs_cfg_open (struct inode *inode,struct file *file) -{ -return single_open (file, debugfs_cfg_show, inode->i_private); -} - -static const struct file_operations debugfs_cfg_fops = { - .owner =THIS_MODULE , - .open = debugfs_cfg_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE (debugfs_cfg);static int ideapad_debugfs_init (struct ideapad_private *priv) {
Signature · 1 line
2.15.1
PATCH 4/4 platform/x86: samsung-laptop: Re-use DEFINE_SHOW_ATTRIBUTE() macro
In reply to Andy Shevchenko...instead of open coding file operations followed by custom ->open() callbacks per each attribute.
--- drivers/platform/x86/samsung-laptop.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
drivers/platform/x86/samsung-laptop.c +3 -15
@@ -1252,7 +1252,7 @@ static int __init samsung_sysfs_init(struct samsung_laptop *samsung) } -static int show_call (struct seq_file *m,void *data) +static int samsung_laptop_call_show (struct seq_file *m,void *data) {struct samsung_laptop *samsung = m->private;struct sabi_data *sdata = &samsung->debug.data;
@@ -1274,19 +1274,7 @@ static int show_call(struct seq_file *m, void *data) sdata->d0, sdata->d1, sdata->d2, sdata->d3);return 0 ; } - -static int samsung_debugfs_open (struct inode *inode,struct file *file) -{ -return single_open (file, show_call, inode->i_private); -} - -static const struct file_operations samsung_laptop_call_io_ops = { - .owner =THIS_MODULE , - .open = samsung_debugfs_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE (samsung_laptop_call);static void samsung_debugfs_exit (struct samsung_laptop *samsung) {
@@ -1351,7 +1339,7 @@ static int samsung_debugfs_init(struct samsung_laptop *samsung) dent =debugfs_create_file ("call" ,S_IFREG |S_IRUGO , samsung->debug.root, samsung, - &samsung_laptop_call_io_ops); + &samsung_laptop_call_fops);if (!dent) goto error_debugfs;
Signature · 1 line
2.15.1
Quoted 7 lines · Andy Shevchenko
The
DEFINE_SHOW_ATTRIBUTE()helper macro would be useful for current users, which are many of them, and for new comers to decrease code duplication.Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/ab8500-debugfs.c | 14 --------------
Quoted 4 lines
drivers/platform/x86/pmc_atom.c | 14 -------------- include/linux/seq_file.h | 14 ++++++++++++++ net/bluetooth/hci_debugfs.c | 13 ------------- 4 files changed, 14 insertions(+), 41 deletions(-)
Signature · 4 lines
Lee Jones Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Darren Hart
Acked-byQuoted 11 lines · Lee Jones
Quoted 7 lines · Andy Shevchenko
The
DEFINE_SHOW_ATTRIBUTE()helper macro would be useful for current users, which are many of them, and for new comers to decrease code duplication.Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/ab8500-debugfs.c | 14 --------------Acked-by Lee Jones <[email protected]>
Thanks Andy,
Signature · 2 lines
Darren Hart VMware Open Source Technology Center
Quoted 12 lines · Darren Hart
Quoted 11 lines · Lee Jones
Quoted 8 lines · Andy Shevchenko
The
DEFINE_SHOW_ATTRIBUTE()helper macro would be useful for current
users, which are many of them, and for new comers to decrease code duplication.Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/ab8500-debugfs.c | 14 --------------
Quoted 5 lines
Quoted 1 line
Acked-by Lee Jones <[email protected]>Thanks Andy,
Just to clarify a bit.
Since the patch series is based on linux-next, the idea is to push it and send as second PR to Linus, after others will be ready in mainline.
The rationale is to allow many other current users and perhaps new comers, e.g. [1], to utilize it already in the next cycle.
[1]: https://patchwork.kernel.org/patch/10172393/
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Quoted 19 lines · Andy Shevchenko
Quoted 12 lines · Darren Hart
Quoted 11 lines · Lee Jones
Quoted 8 lines · Andy Shevchenko
The
DEFINE_SHOW_ATTRIBUTE()helper macro would be useful for current
users, which are many of them, and for new comers to decrease code duplication.Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/ab8500-debugfs.c | 14 --------------Quoted 5 lines
Quoted 1 line
Acked-by Lee Jones <[email protected]>Thanks Andy,
Quoted 7 lines
Just to clarify a bit.
Since the patch series is based on linux-next, the idea is to push it and send as second PR to Linus, after others will be ready in mainline.
The rationale is to allow many other current users and perhaps new comers, e.g. [1], to utilize it already in the next cycle.
You already have my Ack. Knock yourself out.
Quoted 1 line
Signature · 4 lines
Lee Jones Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 5 lines · Andy Shevchenko
The
DEFINE_SHOW_ATTRIBUTE()helper macro would be useful for current users, which are many of them, and for new comers to decrease code duplication.Signed-off-by Andy Shevchenko <[email protected]>
Obviously a good idea.
Yours,
Linus Walleij