Skip to contentSkip to conversation

s390: convert to DEFINE_SHOW_ATTRIBUTE

PATCH Applied Yangtao Li 2 participants 2 messages Dec 2, 2018 – Dec 3, 2018

Subsystems (3)
s390 s390 common I/O layer s390 DASD driver
lore
Share & tools
lore

Yangtao Li

author
#0 lore raw

PATCH 1/1 s390: convert to DEFINE_SHOW_ATTRIBUTE

Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.

Signed-off-by Yangtao Li <[email protected]>
---
 drivers/s390/block/dasd.c     | 15 +--------------
 drivers/s390/cio/qdio_debug.c | 16 ++--------------
 2 files changed, 3 insertions(+), 28 deletions(-)
drivers/s390/block/dasd.c +1 -14
index 5e9ebdb0594c..397af07e4d88 100644
@@ -1192,20 +1192,7 @@ static int dasd_hosts_show(struct seq_file *m, void *v)
 	return rc;
 }
 
-static int dasd_hosts_open(struct inode *inode, struct file *file)
-{
-	struct dasd_device *device = inode->i_private;
-
-	return single_open(file, dasd_hosts_show, device);
-}
-
-static const struct file_operations dasd_hosts_fops = {
-	.owner		= THIS_MODULE,
-	.open		= dasd_hosts_open,
-	.read		= seq_read,
-	.llseek		= seq_lseek,
-	.release	= single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(dasd_hosts);
 
 static void dasd_hosts_exit(struct dasd_device *device)
 {
drivers/s390/cio/qdio_debug.c +2 -14
index 68a82f3e2e92..040061f2bfff 100644
@@ -190,19 +190,7 @@ static int qstat_show(struct seq_file *m, void *v)
 	return 0;
 }
 
-static int qstat_seq_open(struct inode *inode, struct file *filp)
-{
-	return single_open(filp, qstat_show,
-			   file_inode(filp)->i_private);
-}
-
-static const struct file_operations debugfs_fops = {
-	.owner	 = THIS_MODULE,
-	.open	 = qstat_seq_open,
-	.read	 = seq_read,
-	.llseek  = seq_lseek,
-	.release = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(qstat);
 
 static char *qperf_names[] = {
 	"Assumed adapter interrupts",

@@ -306,7 +294,7 @@ static void setup_debugfs_entry(struct qdio_q *q)
 		 q->is_input_q ? "input" : "output",
 		 q->nr);
 	q->debugfs_q = debugfs_create_file(name, S_IFREG | S_IRUGO | S_IWUSR,
-				q->irq_ptr->debugfs_dev, q, &debugfs_fops);
+				q->irq_ptr->debugfs_dev, q, &qstat_fops);
 	if (IS_ERR(q->debugfs_q))
 		q->debugfs_q = NULL;
 }
Signature · 1 line
2.17.0
Applied
#1 lore raw
Quoted 7 lines · Yangtao Li

Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.

Signed-off-by Yangtao Li <[email protected]>
---
 drivers/s390/block/dasd.c     | 15 +--------------
 drivers/s390/cio/qdio_debug.c | 16 ++--------------
 2 files changed, 3 insertions(+), 28 deletions(-)

Applied, thanks!
Sebastian