]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usb: dwc3: debugfs: Re-use DEFINE_SHOW_ATTRIBUTE() macro
authorFelipe Balbi <felipe.balbi@linux.intel.com>
Thu, 15 Feb 2018 11:03:38 +0000 (13:03 +0200)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Thu, 8 Mar 2018 13:12:00 +0000 (15:12 +0200)
...instead of open coding file operations followed by custom ->open()
callbacks per each attribute.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/dwc3/debugfs.c

index 00e65530c81ece64799b8d178c072df03e7faf7f..c4c0dcb3f58969cdcd9215773c523393984ccaef 100644 (file)
@@ -487,8 +487,8 @@ static const struct file_operations dwc3_link_state_fops = {
 };
 
 struct dwc3_ep_file_map {
-       char name[25];
-       int (*show)(struct seq_file *s, void *unused);
+       const char name[25];
+       const struct file_operations *const fops;
 };
 
 static int dwc3_tx_fifo_queue_show(struct seq_file *s, void *unused)
@@ -596,7 +596,7 @@ static int dwc3_event_queue_show(struct seq_file *s, void *unused)
        return 0;
 }
 
-static int dwc3_ep_transfer_type_show(struct seq_file *s, void *unused)
+static int dwc3_transfer_type_show(struct seq_file *s, void *unused)
 {
        struct dwc3_ep          *dep = s->private;
        struct dwc3             *dwc = dep->dwc;
@@ -632,7 +632,7 @@ static int dwc3_ep_transfer_type_show(struct seq_file *s, void *unused)
        return 0;
 }
 
-static int dwc3_ep_trb_ring_show(struct seq_file *s, void *unused)
+static int dwc3_trb_ring_show(struct seq_file *s, void *unused)
 {
        struct dwc3_ep          *dep = s->private;
        struct dwc3             *dwc = dep->dwc;
@@ -670,58 +670,39 @@ static int dwc3_ep_trb_ring_show(struct seq_file *s, void *unused)
        return 0;
 }
 
-static struct dwc3_ep_file_map map[] = {
-       { "tx_fifo_queue", dwc3_tx_fifo_queue_show, },
-       { "rx_fifo_queue", dwc3_rx_fifo_queue_show, },
-       { "tx_request_queue", dwc3_tx_request_queue_show, },
-       { "rx_request_queue", dwc3_rx_request_queue_show, },
-       { "rx_info_queue", dwc3_rx_info_queue_show, },
-       { "descriptor_fetch_queue", dwc3_descriptor_fetch_queue_show, },
-       { "event_queue", dwc3_event_queue_show, },
-       { "transfer_type", dwc3_ep_transfer_type_show, },
-       { "trb_ring", dwc3_ep_trb_ring_show, },
+DEFINE_SHOW_ATTRIBUTE(dwc3_tx_fifo_queue);
+DEFINE_SHOW_ATTRIBUTE(dwc3_rx_fifo_queue);
+DEFINE_SHOW_ATTRIBUTE(dwc3_tx_request_queue);
+DEFINE_SHOW_ATTRIBUTE(dwc3_rx_request_queue);
+DEFINE_SHOW_ATTRIBUTE(dwc3_rx_info_queue);
+DEFINE_SHOW_ATTRIBUTE(dwc3_descriptor_fetch_queue);
+DEFINE_SHOW_ATTRIBUTE(dwc3_event_queue);
+DEFINE_SHOW_ATTRIBUTE(dwc3_transfer_type);
+DEFINE_SHOW_ATTRIBUTE(dwc3_trb_ring);
+
+static const struct dwc3_ep_file_map dwc3_ep_file_map[] = {
+       { "tx_fifo_queue", &dwc3_tx_fifo_queue_fops, },
+       { "rx_fifo_queue", &dwc3_rx_fifo_queue_fops, },
+       { "tx_request_queue", &dwc3_tx_request_queue_fops, },
+       { "rx_request_queue", &dwc3_rx_request_queue_fops, },
+       { "rx_info_queue", &dwc3_rx_info_queue_fops, },
+       { "descriptor_fetch_queue", &dwc3_descriptor_fetch_queue_fops, },
+       { "event_queue", &dwc3_event_queue_fops, },
+       { "transfer_type", &dwc3_transfer_type_fops, },
+       { "trb_ring", &dwc3_trb_ring_fops, },
 };
 
-static int dwc3_endpoint_open(struct inode *inode, struct file *file)
-{
-       const char              *file_name = file_dentry(file)->d_iname;
-       struct dwc3_ep_file_map *f_map;
-       int                     i;
-
-       for (i = 0; i < ARRAY_SIZE(map); i++) {
-               f_map = &map[i];
-
-               if (strcmp(f_map->name, file_name) == 0)
-                       break;
-       }
-
-       return single_open(file, f_map->show, inode->i_private);
-}
-
-static const struct file_operations dwc3_endpoint_fops = {
-       .open                   = dwc3_endpoint_open,
-       .read                   = seq_read,
-       .llseek                 = seq_lseek,
-       .release                = single_release,
-};
-
-static void dwc3_debugfs_create_endpoint_file(struct dwc3_ep *dep,
-               struct dentry *parent, int type)
-{
-       struct dentry           *file;
-       struct dwc3_ep_file_map *ep_file = &map[type];
-
-       file = debugfs_create_file(ep_file->name, S_IRUGO, parent, dep,
-                       &dwc3_endpoint_fops);
-}
-
 static void dwc3_debugfs_create_endpoint_files(struct dwc3_ep *dep,
                struct dentry *parent)
 {
        int                     i;
 
-       for (i = 0; i < ARRAY_SIZE(map); i++)
-               dwc3_debugfs_create_endpoint_file(dep, parent, i);
+       for (i = 0; i < ARRAY_SIZE(dwc3_ep_file_map); i++) {
+               const struct file_operations *fops = dwc3_ep_file_map[i].fops;
+               const char *name = dwc3_ep_file_map[i].name;
+
+               debugfs_create_file(name, S_IRUGO, parent, dep, fops);
+       }
 }
 
 static void dwc3_debugfs_create_endpoint_dir(struct dwc3_ep *dep,