can: switch to seq_file

create_proc_read_entry() is going to be removed soon.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 131 insertions, 150 deletions

diff --git a/net/can/proc.c b/net/can/proc.c
index 1463653dbe34..9b9ad29be567 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -196,8 +196,8 @@ void can_stat_update(unsigned long data)
  *
  */
 
-static int can_print_rcvlist(char *page, int len, struct hlist_head *rx_list,
-                             struct net_device *dev)
+static void can_print_rcvlist(struct seq_file *m, struct hlist_head *rx_list,
+                              struct net_device *dev)
 {
         struct receiver *r;
         struct hlist_node *n;
@@ -208,199 +208,188 @@ static int can_print_rcvlist(char *page, int len, struct hlist_head *rx_list,
                         "   %-5s  %08X  %08x  %08x  %08x  %8ld  %s\n" :
                         "   %-5s     %03X    %08x  %08lx  %08lx  %8ld  %s\n";
 
-                len += snprintf(page + len, PAGE_SIZE - len, fmt,
-                                DNAME(dev), r->can_id, r->mask,
+                seq_printf(m, fmt, DNAME(dev), r->can_id, r->mask,
                                 (unsigned long)r->func, (unsigned long)r->data,
                                 r->matches, r->ident);
-
-                /* does a typical line fit into the current buffer? */
-
-                /* 100 Bytes before end of buffer */
-                if (len > PAGE_SIZE - 100) {
-                        /* mark output cut off */
-                        len += snprintf(page + len, PAGE_SIZE - len,
-                                        "   (..)\n");
-                        break;
-                }
         }
         rcu_read_unlock();
-
-        return len;
 }
 
-static int can_print_recv_banner(char *page, int len)
+static void can_print_recv_banner(struct seq_file *m)
 {
         /*
          *                  can1.  00000000  00000000  00000000
          *                 .......          0  tp20
          */
-        len += snprintf(page + len, PAGE_SIZE - len,
-                        "  device   can_id   can_mask  function"
+        seq_puts(m, "  device   can_id   can_mask  function"
                         "  userdata   matches  ident\n");
-
-        return len;
 }
 
-static int can_proc_read_stats(char *page, char **start, off_t off,
-                               int count, int *eof, void *data)
+static int can_stats_proc_show(struct seq_file *m, void *v)
 {
-        int len = 0;
+        seq_putc(m, '\n');
+        seq_printf(m, " %8ld transmitted frames (TXF)\n", can_stats.tx_frames);
+        seq_printf(m, " %8ld received frames (RXF)\n", can_stats.rx_frames);
+        seq_printf(m, " %8ld matched frames (RXMF)\n", can_stats.matches);
 
-        len += snprintf(page + len, PAGE_SIZE - len, "\n");
-        len += snprintf(page + len, PAGE_SIZE - len,
-                        " %8ld transmitted frames (TXF)\n",
-                        can_stats.tx_frames);
-        len += snprintf(page + len, PAGE_SIZE - len,
-                        " %8ld received frames (RXF)\n", can_stats.rx_frames);
-        len += snprintf(page + len, PAGE_SIZE - len,
-                        " %8ld matched frames (RXMF)\n", can_stats.matches);
-
-        len += snprintf(page + len, PAGE_SIZE - len, "\n");
+        seq_putc(m, '\n');
 
         if (can_stattimer.function == can_stat_update) {
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                " %8ld %% total match ratio (RXMR)\n",
+                seq_printf(m, " %8ld %% total match ratio (RXMR)\n",
                                 can_stats.total_rx_match_ratio);
 
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                " %8ld frames/s total tx rate (TXR)\n",
+                seq_printf(m, " %8ld frames/s total tx rate (TXR)\n",
                                 can_stats.total_tx_rate);
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                " %8ld frames/s total rx rate (RXR)\n",
+                seq_printf(m, " %8ld frames/s total rx rate (RXR)\n",
                                 can_stats.total_rx_rate);
 
-                len += snprintf(page + len, PAGE_SIZE - len, "\n");
+                seq_putc(m, '\n');
 
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                " %8ld %% current match ratio (CRXMR)\n",
+                seq_printf(m, " %8ld %% current match ratio (CRXMR)\n",
                                 can_stats.current_rx_match_ratio);
 
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                " %8ld frames/s current tx rate (CTXR)\n",
+                seq_printf(m, " %8ld frames/s current tx rate (CTXR)\n",
                                 can_stats.current_tx_rate);
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                " %8ld frames/s current rx rate (CRXR)\n",
+                seq_printf(m, " %8ld frames/s current rx rate (CRXR)\n",
                                 can_stats.current_rx_rate);
 
-                len += snprintf(page + len, PAGE_SIZE - len, "\n");
+                seq_putc(m, '\n');
 
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                " %8ld %% max match ratio (MRXMR)\n",
+                seq_printf(m, " %8ld %% max match ratio (MRXMR)\n",
                                 can_stats.max_rx_match_ratio);
 
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                " %8ld frames/s max tx rate (MTXR)\n",
+                seq_printf(m, " %8ld frames/s max tx rate (MTXR)\n",
                                 can_stats.max_tx_rate);
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                " %8ld frames/s max rx rate (MRXR)\n",
+                seq_printf(m, " %8ld frames/s max rx rate (MRXR)\n",
                                 can_stats.max_rx_rate);
 
-                len += snprintf(page + len, PAGE_SIZE - len, "\n");
+                seq_putc(m, '\n');
         }
 
-        len += snprintf(page + len, PAGE_SIZE - len,
-                        " %8ld current receive list entries (CRCV)\n",
+        seq_printf(m, " %8ld current receive list entries (CRCV)\n",
                         can_pstats.rcv_entries);
-        len += snprintf(page + len, PAGE_SIZE - len,
-                        " %8ld maximum receive list entries (MRCV)\n",
+        seq_printf(m, " %8ld maximum receive list entries (MRCV)\n",
                         can_pstats.rcv_entries_max);
 
         if (can_pstats.stats_reset)
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                "\n %8ld statistic resets (STR)\n",
+                seq_printf(m, "\n %8ld statistic resets (STR)\n",
                                 can_pstats.stats_reset);
 
         if (can_pstats.user_reset)
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                " %8ld user statistic resets (USTR)\n",
+                seq_printf(m, " %8ld user statistic resets (USTR)\n",
                                 can_pstats.user_reset);
 
-        len += snprintf(page + len, PAGE_SIZE - len, "\n");
-
-        *eof = 1;
-        return len;
+        seq_putc(m, '\n');
+        return 0;
 }
 
-static int can_proc_read_reset_stats(char *page, char **start, off_t off,
-                                     int count, int *eof, void *data)
+static int can_stats_proc_open(struct inode *inode, struct file *file)
 {
-        int len = 0;
+        return single_open(file, can_stats_proc_show, NULL);
+}
+
+static const struct file_operations can_stats_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = can_stats_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 
+static int can_reset_stats_proc_show(struct seq_file *m, void *v)
+{
         user_reset = 1;
 
         if (can_stattimer.function == can_stat_update) {
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                "Scheduled statistic reset #%ld.\n",
+                seq_printf(m, "Scheduled statistic reset #%ld.\n",
                                 can_pstats.stats_reset + 1);
 
         } else {
                 if (can_stats.jiffies_init != jiffies)
                         can_init_stats();
 
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                "Performed statistic reset #%ld.\n",
+                seq_printf(m, "Performed statistic reset #%ld.\n",
                                 can_pstats.stats_reset);
         }
+        return 0;
+}
 
-        *eof = 1;
-        return len;
+static int can_reset_stats_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, can_reset_stats_proc_show, NULL);
 }
 
-static int can_proc_read_version(char *page, char **start, off_t off,
-                                 int count, int *eof, void *data)
+static const struct file_operations can_reset_stats_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = can_reset_stats_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int can_version_proc_show(struct seq_file *m, void *v)
 {
-        int len = 0;
+        seq_printf(m, "%s\n", CAN_VERSION_STRING);
+        return 0;
+}
 
-        len += snprintf(page + len, PAGE_SIZE - len, "%s\n",
-                        CAN_VERSION_STRING);
-        *eof = 1;
-        return len;
+static int can_version_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, can_version_proc_show, NULL);
 }
 
-static int can_proc_read_rcvlist(char *page, char **start, off_t off,
-                                 int count, int *eof, void *data)
+static const struct file_operations can_version_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = can_version_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int can_rcvlist_proc_show(struct seq_file *m, void *v)
 {
         /* double cast to prevent GCC warning */
-        int idx = (int)(long)data;
-        int len = 0;
+        int idx = (int)(long)m->private;
         struct dev_rcv_lists *d;
         struct hlist_node *n;
 
-        len += snprintf(page + len, PAGE_SIZE - len,
-                        "\nreceive list '%s':\n", rx_list_name[idx]);
+        seq_printf(m, "\nreceive list '%s':\n", rx_list_name[idx]);
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(d, n, &can_rx_dev_list, list) {
 
                 if (!hlist_empty(&d->rx[idx])) {
-                        len = can_print_recv_banner(page, len);
-                        len = can_print_rcvlist(page, len, &d->rx[idx], d->dev);
+                        can_print_recv_banner(m);
+                        can_print_rcvlist(m, &d->rx[idx], d->dev);
                 } else
-                        len += snprintf(page + len, PAGE_SIZE - len,
-                                        "  (%s: no entry)\n", DNAME(d->dev));
-
-                /* exit on end of buffer? */
-                if (len > PAGE_SIZE - 100)
-                        break;
+                        seq_printf(m, "  (%s: no entry)\n", DNAME(d->dev));
         }
         rcu_read_unlock();
 
-        len += snprintf(page + len, PAGE_SIZE - len, "\n");
+        seq_putc(m, '\n');
+        return 0;
+}
 
-        *eof = 1;
-        return len;
+static int can_rcvlist_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, can_rcvlist_proc_show, PDE(inode)->data);
 }
 
-static int can_proc_read_rcvlist_sff(char *page, char **start, off_t off,
-                                     int count, int *eof, void *data)
+static const struct file_operations can_rcvlist_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = can_rcvlist_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v)
 {
-        int len = 0;
         struct dev_rcv_lists *d;
         struct hlist_node *n;
 
         /* RX_SFF */
-        len += snprintf(page + len, PAGE_SIZE - len,
-                        "\nreceive list 'rx_sff':\n");
+        seq_puts(m, "\nreceive list 'rx_sff':\n");
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(d, n, &can_rx_dev_list, list) {
@@ -413,46 +402,38 @@ static int can_proc_read_rcvlist_sff(char *page, char **start, off_t off,
                         }
 
                 if (!all_empty) {
-                        len = can_print_recv_banner(page, len);
+                        can_print_recv_banner(m);
                         for (i = 0; i < 0x800; i++) {
-                                if (!hlist_empty(&d->rx_sff[i]) &&
-                                    len < PAGE_SIZE - 100)
-                                        len = can_print_rcvlist(page, len,
-                                                                &d->rx_sff[i],
-                                                                d->dev);
+                                if (!hlist_empty(&d->rx_sff[i]))
+                                        can_print_rcvlist(m, &d->rx_sff[i],
+                                                          d->dev);
                         }
                 } else
-                        len += snprintf(page + len, PAGE_SIZE - len,
-                                        "  (%s: no entry)\n", DNAME(d->dev));
-
-                /* exit on end of buffer? */
-                if (len > PAGE_SIZE - 100)
-                        break;
+                        seq_printf(m, "  (%s: no entry)\n", DNAME(d->dev));
         }
         rcu_read_unlock();
 
-        len += snprintf(page + len, PAGE_SIZE - len, "\n");
+        seq_putc(m, '\n');
+        return 0;
+}
 
-        *eof = 1;
-        return len;
+static int can_rcvlist_sff_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, can_rcvlist_sff_proc_show, NULL);
 }
 
+static const struct file_operations can_rcvlist_sff_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = can_rcvlist_sff_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /*
  * proc utility functions
  */
 
-static struct proc_dir_entry *can_create_proc_readentry(const char *name,
-                                                        mode_t mode,
-                                                        read_proc_t *read_proc,
-                                                        void *data)
-{
-        if (can_dir)
-                return create_proc_read_entry(name, mode, can_dir, read_proc,
-                                              data);
-        else
-                return NULL;
-}
-
 static void can_remove_proc_readentry(const char *name)
 {
         if (can_dir)
@@ -474,24 +455,24 @@ void can_init_proc(void)
         }
 
         /* own procfs entries from the AF_CAN core */
-        pde_version     = can_create_proc_readentry(CAN_PROC_VERSION, 0644,
-                                        can_proc_read_version, NULL);
-        pde_stats       = can_create_proc_readentry(CAN_PROC_STATS, 0644,
-                                        can_proc_read_stats, NULL);
-        pde_reset_stats = can_create_proc_readentry(CAN_PROC_RESET_STATS, 0644,
-                                        can_proc_read_reset_stats, NULL);
-        pde_rcvlist_err = can_create_proc_readentry(CAN_PROC_RCVLIST_ERR, 0644,
-                                        can_proc_read_rcvlist, (void *)RX_ERR);
-        pde_rcvlist_all = can_create_proc_readentry(CAN_PROC_RCVLIST_ALL, 0644,
-                                        can_proc_read_rcvlist, (void *)RX_ALL);
-        pde_rcvlist_fil = can_create_proc_readentry(CAN_PROC_RCVLIST_FIL, 0644,
-                                        can_proc_read_rcvlist, (void *)RX_FIL);
-        pde_rcvlist_inv = can_create_proc_readentry(CAN_PROC_RCVLIST_INV, 0644,
-                                        can_proc_read_rcvlist, (void *)RX_INV);
-        pde_rcvlist_eff = can_create_proc_readentry(CAN_PROC_RCVLIST_EFF, 0644,
-                                        can_proc_read_rcvlist, (void *)RX_EFF);
-        pde_rcvlist_sff = can_create_proc_readentry(CAN_PROC_RCVLIST_SFF, 0644,
-                                        can_proc_read_rcvlist_sff, NULL);
+        pde_version     = proc_create(CAN_PROC_VERSION, 0644, can_dir,
+                                      &can_version_proc_fops);
+        pde_stats       = proc_create(CAN_PROC_STATS, 0644, can_dir,
+                                      &can_stats_proc_fops);
+        pde_reset_stats = proc_create(CAN_PROC_RESET_STATS, 0644, can_dir,
+                                      &can_reset_stats_proc_fops);
+        pde_rcvlist_err = proc_create_data(CAN_PROC_RCVLIST_ERR, 0644, can_dir,
+                                           &can_rcvlist_proc_fops, (void *)RX_ERR);
+        pde_rcvlist_all = proc_create_data(CAN_PROC_RCVLIST_ALL, 0644, can_dir,
+                                           &can_rcvlist_proc_fops, (void *)RX_ALL);
+        pde_rcvlist_fil = proc_create_data(CAN_PROC_RCVLIST_FIL, 0644, can_dir,
+                                           &can_rcvlist_proc_fops, (void *)RX_FIL);
+        pde_rcvlist_inv = proc_create_data(CAN_PROC_RCVLIST_INV, 0644, can_dir,
+                                           &can_rcvlist_proc_fops, (void *)RX_INV);
+        pde_rcvlist_eff = proc_create_data(CAN_PROC_RCVLIST_EFF, 0644, can_dir,
+                                           &can_rcvlist_proc_fops, (void *)RX_EFF);
+        pde_rcvlist_sff = proc_create(CAN_PROC_RCVLIST_SFF, 0644, can_dir,
+                                      &can_rcvlist_sff_proc_fops);
 }
 
 /*