staging: unisys: remove file.c and pass functionality to visorchipset
authorErik Arfvidson <erik.arfvidson@unisys.com>
Tue, 5 May 2015 22:36:13 +0000 (18:36 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 May 2015 13:26:00 +0000 (15:26 +0200)
This patch trasitions the include files and functions from file.c
and places them into visorchipset_main.c

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/visorchipset/Makefile
drivers/staging/unisys/visorchipset/file.c [deleted file]
drivers/staging/unisys/visorchipset/visorchipset_main.c

index 1bf6699579eccc798abe5a7af29faad81ce0bc83..6886cb7bd3976c9609d8d2063bfae9da4f013723 100644 (file)
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_UNISYS_VISORCHIPSET)      += visorchipset.o
 
-visorchipset-y := visorchipset_main.o file.o parser.o
+visorchipset-y := visorchipset_main.o parser.o
 
 ccflags-y += -Idrivers/staging/unisys/include
 ccflags-y += -Idrivers/staging/unisys/uislib
diff --git a/drivers/staging/unisys/visorchipset/file.c b/drivers/staging/unisys/visorchipset/file.c
deleted file mode 100644 (file)
index c0bd416..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-/* file.c
- *
- * Copyright (C) 2010 - 2013 UNISYS CORPORATION
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- */
-
-/* This contains the implementation that allows a usermode program to
- * communicate with the visorchipset driver using a device/file interface.
- */
-
-#include <linux/fs.h>
-#include <linux/mm.h>
-
-#include "version.h"
-#include "visorchipset.h"
-#include "visorbus.h"
-#include "uisutils.h"
-#include "visorchipset.h"
-
-#define CURRENT_FILE_PC VISOR_CHIPSET_PC_file_c
-
-static struct cdev file_cdev;
-static struct visorchannel **file_controlvm_channel;
-
-void
-visorchipset_file_cleanup(dev_t major_dev)
-{
-       if (file_cdev.ops)
-               cdev_del(&file_cdev);
-       file_cdev.ops = NULL;
-       unregister_chrdev_region(major_dev, 1);
-}
-
-static int
-visorchipset_open(struct inode *inode, struct file *file)
-{
-       unsigned minor_number = iminor(inode);
-
-       if (minor_number)
-               return -ENODEV;
-       file->private_data = NULL;
-       return 0;
-}
-
-static int
-visorchipset_release(struct inode *inode, struct file *file)
-{
-       return 0;
-}
-
-static int
-visorchipset_mmap(struct file *file, struct vm_area_struct *vma)
-{
-       unsigned long physaddr = 0;
-       unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
-       GUEST_PHYSICAL_ADDRESS addr = 0;
-
-       /* sv_enable_dfp(); */
-       if (offset & (PAGE_SIZE - 1))
-               return -ENXIO;  /* need aligned offsets */
-
-       switch (offset) {
-       case VISORCHIPSET_MMAP_CONTROLCHANOFFSET:
-               vma->vm_flags |= VM_IO;
-               if (!*file_controlvm_channel)
-                       return -ENXIO;
-
-               visorchannel_read(*file_controlvm_channel,
-                       offsetof(struct spar_controlvm_channel_protocol,
-                                gp_control_channel),
-                       &addr, sizeof(addr));
-               if (!addr)
-                       return -ENXIO;
-
-               physaddr = (unsigned long)addr;
-               if (remap_pfn_range(vma, vma->vm_start,
-                                   physaddr >> PAGE_SHIFT,
-                                   vma->vm_end - vma->vm_start,
-                                   /*pgprot_noncached */
-                                   (vma->vm_page_prot))) {
-                       return -EAGAIN;
-               }
-               break;
-       default:
-               return -ENOSYS;
-       }
-       return 0;
-}
-
-static long visorchipset_ioctl(struct file *file, unsigned int cmd,
-                              unsigned long arg)
-{
-       s64 adjustment;
-       s64 vrtc_offset;
-
-       switch (cmd) {
-       case VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET:
-               /* get the physical rtc offset */
-               vrtc_offset = issue_vmcall_query_guest_virtual_time_offset();
-               if (copy_to_user((void __user *)arg, &vrtc_offset,
-                                sizeof(vrtc_offset))) {
-                       return -EFAULT;
-               }
-               return SUCCESS;
-       case VMCALL_UPDATE_PHYSICAL_TIME:
-               if (copy_from_user(&adjustment, (void __user *)arg,
-                                  sizeof(adjustment))) {
-                       return -EFAULT;
-               }
-               return issue_vmcall_update_physical_time(adjustment);
-       default:
-               return -EFAULT;
-       }
-}
-
-static const struct file_operations visorchipset_fops = {
-       .owner = THIS_MODULE,
-       .open = visorchipset_open,
-       .read = NULL,
-       .write = NULL,
-       .unlocked_ioctl = visorchipset_ioctl,
-       .release = visorchipset_release,
-       .mmap = visorchipset_mmap,
-};
-
-int
-visorchipset_file_init(dev_t major_dev, struct visorchannel **controlvm_channel)
-{
-       int rc = 0;
-
-       file_controlvm_channel = controlvm_channel;
-       cdev_init(&file_cdev, &visorchipset_fops);
-       file_cdev.owner = THIS_MODULE;
-       if (MAJOR(major_dev) == 0) {
-               rc = alloc_chrdev_region(&major_dev, 0, 1, MYDRVNAME);
-               /* dynamic major device number registration required */
-               if (rc < 0)
-                       return rc;
-       } else {
-               /* static major device number registration required */
-               rc = register_chrdev_region(major_dev, 1, MYDRVNAME);
-               if (rc < 0)
-                       return rc;
-       }
-       rc = cdev_add(&file_cdev, MKDEV(MAJOR(major_dev), 0), 1);
-       if (rc < 0) {
-               unregister_chrdev_region(major_dev, 1);
-               return rc;
-       }
-       return 0;
-}
index 34ac17b4a6f57b379f53dae883532ff25823de08..d5bd1a11ad882fa79d6dc0f7a892161702a60f04 100644 (file)
@@ -16,7 +16,6 @@
  */
 
 #include "version.h"
-#include "visorchipset.h"
 #include "procobjecttree.h"
 #include "visorbus.h"
 #include "periodic_work.h"
 #include "uisutils.h"
 #include "controlvmcompletionstatus.h"
 #include "guestlinuxdebug.h"
+#include "visorchipset.h"
 
+#include <linux/fs.h>
+#include <linux/mm.h>
 #include <linux/nls.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
@@ -56,6 +58,23 @@ static int visorchipset_testteardown;
 static int visorchipset_disable_controlvm;
 static int visorchipset_holdchipsetready;
 
+static int
+visorchipset_open(struct inode *inode, struct file *file)
+{
+       unsigned minor_number = iminor(inode);
+
+       if (minor_number)
+               return -ENODEV;
+       file->private_data = NULL;
+       return 0;
+}
+
+static int
+visorchipset_release(struct inode *inode, struct file *file)
+{
+       return 0;
+}
+
 /* When the controlvm channel is idle for at least MIN_IDLE_SECONDS,
 * we switch to slow polling mode.  As soon as we get a controlvm
 * message, we switch back to fast polling mode.
@@ -74,6 +93,8 @@ static struct delayed_work periodic_controlvm_work;
 static struct workqueue_struct *periodic_controlvm_workqueue;
 static DEFINE_SEMAPHORE(notifier_lock);
 
+static struct cdev file_cdev;
+static struct visorchannel **file_controlvm_channel;
 static struct controlvm_message_header g_chipset_msg_hdr;
 static const uuid_le spar_diag_pool_channel_protocol_uuid =
        SPAR_DIAG_POOL_CHANNEL_PROTOCOL_UUID;
@@ -2169,6 +2190,110 @@ static ssize_t deviceenabled_store(struct device *dev,
        return count;
 }
 
+static int
+visorchipset_mmap(struct file *file, struct vm_area_struct *vma)
+{
+       unsigned long physaddr = 0;
+       unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+       GUEST_PHYSICAL_ADDRESS addr = 0;
+
+       /* sv_enable_dfp(); */
+       if (offset & (PAGE_SIZE - 1))
+               return -ENXIO;  /* need aligned offsets */
+
+       switch (offset) {
+       case VISORCHIPSET_MMAP_CONTROLCHANOFFSET:
+               vma->vm_flags |= VM_IO;
+               if (!*file_controlvm_channel)
+                       return -ENXIO;
+
+               visorchannel_read(*file_controlvm_channel,
+                       offsetof(struct spar_controlvm_channel_protocol,
+                                gp_control_channel),
+                       &addr, sizeof(addr));
+               if (!addr)
+                       return -ENXIO;
+
+               physaddr = (unsigned long)addr;
+               if (remap_pfn_range(vma, vma->vm_start,
+                                   physaddr >> PAGE_SHIFT,
+                                   vma->vm_end - vma->vm_start,
+                                   /*pgprot_noncached */
+                                   (vma->vm_page_prot))) {
+                       return -EAGAIN;
+               }
+               break;
+       default:
+               return -ENXIO;
+       }
+       return 0;
+}
+
+static long visorchipset_ioctl(struct file *file, unsigned int cmd,
+                              unsigned long arg)
+{
+       s64 adjustment;
+       s64 vrtc_offset;
+
+       switch (cmd) {
+       case VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET:
+               /* get the physical rtc offset */
+               vrtc_offset = issue_vmcall_query_guest_virtual_time_offset();
+               if (copy_to_user((void __user *)arg, &vrtc_offset,
+                                sizeof(vrtc_offset))) {
+                       return -EFAULT;
+               }
+               return SUCCESS;
+       case VMCALL_UPDATE_PHYSICAL_TIME:
+               if (copy_from_user(&adjustment, (void __user *)arg,
+                                  sizeof(adjustment))) {
+                       return -EFAULT;
+               }
+               return issue_vmcall_update_physical_time(adjustment);
+       default:
+               return -EFAULT;
+       }
+}
+
+static const struct file_operations visorchipset_fops = {
+       .owner = THIS_MODULE,
+       .open = visorchipset_open,
+       .read = NULL,
+       .write = NULL,
+       .unlocked_ioctl = visorchipset_ioctl,
+       .release = visorchipset_release,
+       .mmap = visorchipset_mmap,
+};
+
+int
+visorchipset_file_init(dev_t major_dev, struct visorchannel **controlvm_channel)
+{
+       int rc = 0;
+
+       file_controlvm_channel = controlvm_channel;
+       cdev_init(&file_cdev, &visorchipset_fops);
+       file_cdev.owner = THIS_MODULE;
+       if (MAJOR(major_dev) == 0) {
+               rc = alloc_chrdev_region(&major_dev, 0, 1, MYDRVNAME);
+               /* dynamic major device number registration required */
+               if (rc < 0)
+                       return rc;
+       } else {
+               /* static major device number registration required */
+               rc = register_chrdev_region(major_dev, 1, MYDRVNAME);
+               if (rc < 0)
+                       return rc;
+       }
+       rc = cdev_add(&file_cdev, MKDEV(MAJOR(major_dev), 0), 1);
+       if (rc < 0) {
+               unregister_chrdev_region(major_dev, 1);
+               return rc;
+       }
+       return 0;
+}
+
+
+
 static int __init
 visorchipset_init(void)
 {
@@ -2262,6 +2387,15 @@ cleanup:
        return rc;
 }
 
+void
+visorchipset_file_cleanup(dev_t major_dev)
+{
+       if (file_cdev.ops)
+               cdev_del(&file_cdev);
+       file_cdev.ops = NULL;
+       unregister_chrdev_region(major_dev, 1);
+}
+
 static void
 visorchipset_exit(void)
 {