2020-07-16 09:01:47

by Qinglang Miao

Subject: [PATCH -next] mfd: Convert to DEFINE_SHOW_ATTRIBUTE

From: Yongqiang Liu <[email protected]>

Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.

Signed-off-by: Yongqiang Liu <[email protected]>
---
drivers/mfd/ab3100-core.c | 15 ++-------------
drivers/mfd/ab3100-otp.c | 16 +++-------------
drivers/mfd/tps65010.c | 14 ++------------
3 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 092c78b5e..4a347d059 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -451,7 +451,7 @@ static irqreturn_t ab3100_irq_handler(int irq, void *data)
/*
* Some debugfs entries only exposed if we're using debug
*/
-static int ab3100_registers_print(struct seq_file *s, void *p)
+static int ab3100_registers_show(struct seq_file *s, void *p)
{
struct ab3100 *ab3100 = s->private;
u8 value;
@@ -466,18 +466,7 @@ static int ab3100_registers_print(struct seq_file *s, void *p)
return 0;
}

-static int ab3100_registers_open(struct inode *inode, struct file *file)
-{
- return single_open(file, ab3100_registers_print, inode->i_private);
-}
-
-static const struct file_operations ab3100_registers_fops = {
- .open = ab3100_registers_open,
- .read_iter = seq_read_iter,
- .llseek = seq_lseek,
- .release = single_release,
- .owner = THIS_MODULE,
-};
+DEFINE_SHOW_ATTRIBUTE(ab3100_registers);

struct ab3100_get_set_reg_priv {
struct ab3100 *ab3100;
diff --git a/drivers/mfd/ab3100-otp.c b/drivers/mfd/ab3100-otp.c
index 3c1157e7a..e5d294805 100644
--- a/drivers/mfd/ab3100-otp.c
+++ b/drivers/mfd/ab3100-otp.c
@@ -96,7 +96,7 @@ static int __init ab3100_otp_read(struct ab3100_otp *otp)
* the contents of the OTP.
*/
#ifdef CONFIG_DEBUG_FS
-static int ab3100_show_otp(struct seq_file *s, void *v)
+static int ab3100_otp_show(struct seq_file *s, void *v)
{
struct ab3100_otp *otp = s->private;

@@ -110,23 +110,13 @@ static int ab3100_show_otp(struct seq_file *s, void *v)
return 0;
}

-static int ab3100_otp_open(struct inode *inode, struct file *file)
-{
- return single_open(file, ab3100_show_otp, inode->i_private);
-}
-
-static const struct file_operations ab3100_otp_operations = {
- .open = ab3100_otp_open,
- .read_iter = seq_read_iter,
- .llseek = seq_lseek,
- .release = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(ab3100_otp);

static void __init ab3100_otp_init_debugfs(struct device *dev,
struct ab3100_otp *otp)
{
otp->debugfs = debugfs_create_file("ab3100_otp", S_IFREG | S_IRUGO,
- NULL, otp, &ab3100_otp_operations);
+ NULL, otp, &ab3100_otp_fops);
}

static void __exit ab3100_otp_exit_debugfs(struct ab3100_otp *otp)
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c
index 31259867f..f6d6b6c18 100644
--- a/drivers/mfd/tps65010.c
+++ b/drivers/mfd/tps65010.c
@@ -179,7 +179,7 @@ static inline void show_chgconfig(int por, const char *label, u8 chgconfig) { }

#ifdef CONFIG_DEBUG_FS

-static int dbg_show(struct seq_file *s, void *_)
+static int debug_show(struct seq_file *s, void *_)
{
struct tps65010 *tps = s->private;
u8 value, v2;
@@ -283,17 +283,7 @@ static int dbg_show(struct seq_file *s, void *_)
return 0;
}

-static int dbg_tps_open(struct inode *inode, struct file *file)
-{
- return single_open(file, dbg_show, inode->i_private);
-}
-
-static const struct file_operations debug_fops = {
- .open = dbg_tps_open,
- .read_iter = seq_read_iter,
- .llseek = seq_lseek,
- .release = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(debug);

#define DEBUG_FOPS &debug_fops

--
2.17.1

2020-07-16 13:48:50

by Lee Jones

Subject: Re: [PATCH -next] mfd: Convert to DEFINE_SHOW_ATTRIBUTE

On Thu, 16 Jul 2020, Qinglang Miao wrote:

> From: Yongqiang Liu <[email protected]>
>
> Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.
>
> Signed-off-by: Yongqiang Liu <[email protected]>
> ---
> drivers/mfd/ab3100-core.c | 15 ++-------------
> drivers/mfd/ab3100-otp.c | 16 +++-------------
> drivers/mfd/tps65010.c | 14 ++------------

Can you split this out into different patches please.

> 3 files changed, 7 insertions(+), 38 deletions(-)

--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

2020-09-19 02:19:01

by Qinglang Miao

Subject: Re: [PATCH -next] mfd: Convert to DEFINE_SHOW_ATTRIBUTE

在 2020/7/16 21:46, Lee Jones 写道:
> On Thu, 16 Jul 2020, Qinglang Miao wrote:
>
>> From: Yongqiang Liu <[email protected]>
>>
>> Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.
>>
>> Signed-off-by: Yongqiang Liu <[email protected]>
>> ---
>> drivers/mfd/ab3100-core.c | 15 ++-------------
>> drivers/mfd/ab3100-otp.c | 16 +++-------------
>> drivers/mfd/tps65010.c | 14 ++------------
>
> Can you split this out into different patches please.

Hi Lee,

I've splited this out into three patches.

They are against linux-next(20200917), and can be applied to mainline
cleanly now.

Thanks.
>
>> 3 files changed, 7 insertions(+), 38 deletions(-)
>