Merge tag 'dma-mapping-4.18' of git://git.infradead.org/users/hch/dma-mapping

[linux] / drivers / parisc / ccio-dma.c

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 2b129d8..6148236 100644 (file)
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1108,19 +1108,6 @@ static int ccio_proc_info(struct seq_file *m, void *p)
        return 0;
 }
 
-static int ccio_proc_info_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, &ccio_proc_info, NULL);
-}
-
-static const struct file_operations ccio_proc_info_fops = {
-       .owner = THIS_MODULE,
-       .open = ccio_proc_info_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-};
-
 static int ccio_proc_bitmap_info(struct seq_file *m, void *p)
 {
        struct ioc *ioc = ioc_list;
@@ -1135,19 +1122,6 @@ static int ccio_proc_bitmap_info(struct seq_file *m, void *p)
 
        return 0;
 }
-
-static int ccio_proc_bitmap_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, &ccio_proc_bitmap_info, NULL);
-}
-
-static const struct file_operations ccio_proc_bitmap_fops = {
-       .owner = THIS_MODULE,
-       .open = ccio_proc_bitmap_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-};
 #endif /* CONFIG_PROC_FS */
 
 /**
@@ -1195,7 +1169,7 @@ void * ccio_get_iommu(const struct parisc_device *dev)
  * to/from certain pages.  To avoid this happening, we mark these pages
  * as `used', and ensure that nothing will try to allocate from them.
  */
-void ccio_cujo20_fixup(struct parisc_device *cujo, u32 iovp)
+void __init ccio_cujo20_fixup(struct parisc_device *cujo, u32 iovp)
 {
        unsigned int idx;
        struct parisc_device *dev = parisc_parent(cujo);
@@ -1263,7 +1237,7 @@ static struct parisc_driver ccio_driver __refdata = {
  * I/O Page Directory, the resource map, and initalizing the
  * U2/Uturn chip into virtual mode.
  */
-static void
+static void __init
 ccio_ioc_init(struct ioc *ioc)
 {
        int i;
@@ -1589,10 +1563,10 @@ static int __init ccio_probe(struct parisc_device *dev)
 
 #ifdef CONFIG_PROC_FS
        if (ioc_count == 0) {
-               proc_create(MODULE_NAME, 0, proc_runway_root,
-                           &ccio_proc_info_fops);
-               proc_create(MODULE_NAME"-bitmap", 0, proc_runway_root,
-                           &ccio_proc_bitmap_fops);
+               proc_create_single(MODULE_NAME, 0, proc_runway_root,
+                               ccio_proc_info);
+               proc_create_single(MODULE_NAME"-bitmap", 0, proc_runway_root,
+                               ccio_proc_bitmap_info);
        }
 #endif
        ioc_count++;