Remove XGI_IOCTL_CPUID and associated cruft.

diff --git a/linux-core/xgi_drv.c b/linux-core/xgi_drv.c
index 44b003a..081db19 100644 (file)
--- a/linux-core/xgi_drv.c
+++ b/linux-core/xgi_drv.c
@@ -960,10 +960,6 @@ int xgi_kern_ioctl(struct inode *inode, struct file *filp,
                XGI_INFO("Jong-xgi_state_change \n");
                xgi_state_change(info, (struct xgi_state_info *) arg_copy);
                break;
-       case XGI_ESC_CPUID:
-               XGI_INFO("Jong-XGI_ESC_CPUID \n");
-               xgi_get_cpu_id((struct cpu_info *)arg_copy);
-               break;
        default:
                XGI_INFO("Jong-xgi_ioctl_default \n");
                status = -EINVAL;

diff --git a/linux-core/xgi_drv.h b/linux-core/xgi_drv.h
index 360e712..248377a 100644 (file)
--- a/linux-core/xgi_drv.h
+++ b/linux-core/xgi_drv.h
@@ -234,13 +234,6 @@ struct xgi_state_info {
        U32 _toState;
 };
 
-struct cpu_info {
-       U32 _eax;
-       U32 _ebx;
-       U32 _ecx;
-       U32 _edx;
-};
-
 struct xgi_mem_pid {
        struct list_head list;
        enum xgi_mem_location location;
@@ -275,8 +268,7 @@ struct xgi_mem_pid {
 #define XGI_ESC_STATE_CHANGE        (XGI_IOCTL_BASE + 17)
 #define XGI_ESC_MMIO_INFO           (XGI_IOCTL_BASE + 18)
 #define XGI_ESC_PCIE_CHECK          (XGI_IOCTL_BASE + 19)
-#define XGI_ESC_CPUID               (XGI_IOCTL_BASE + 20)
-#define XGI_ESC_MEM_COLLECT          (XGI_IOCTL_BASE + 21)
+#define XGI_ESC_MEM_COLLECT         (XGI_IOCTL_BASE + 20)
 
 #define XGI_IOCTL_DEVICE_INFO       _IOR(XGI_IOCTL_MAGIC, XGI_ESC_DEVICE_INFO, struct xgi_chip_info)
 #define XGI_IOCTL_POST_VBIOS        _IO(XGI_IOCTL_MAGIC, XGI_ESC_POST_VBIOS)
@@ -298,12 +290,11 @@ struct xgi_mem_pid {
 #define XGI_IOCTL_DEBUG_INFO        _IO(XGI_IOCTL_MAGIC, XGI_ESC_DEBUG_INFO)
 #define XGI_IOCTL_MMIO_INFO         _IOR(XGI_IOCTL_MAGIC, XGI_ESC_MMIO_INFO, struct xgi_mmio_info)
 
-#define XGI_IOCTL_SUBMIT_CMDLIST       _IOWR(XGI_IOCTL_MAGIC, XGI_ESC_SUBMIT_CMDLIST, struct xgi_cmd_info)
-#define XGI_IOCTL_TEST_RWINKERNEL      _IOWR(XGI_IOCTL_MAGIC, XGI_ESC_TEST_RWINKERNEL, unsigned long)
+#define XGI_IOCTL_SUBMIT_CMDLIST    _IOWR(XGI_IOCTL_MAGIC, XGI_ESC_SUBMIT_CMDLIST, struct xgi_cmd_info)
+#define XGI_IOCTL_TEST_RWINKERNEL   _IOWR(XGI_IOCTL_MAGIC, XGI_ESC_TEST_RWINKERNEL, unsigned long)
 #define XGI_IOCTL_STATE_CHANGE      _IOWR(XGI_IOCTL_MAGIC, XGI_ESC_STATE_CHANGE, struct xgi_state_info)
 
 #define XGI_IOCTL_PCIE_CHECK        _IO(XGI_IOCTL_MAGIC, XGI_ESC_PCIE_CHECK)
-#define XGI_IOCTL_CPUID             _IOWR(XGI_IOCTL_MAGIC, XGI_ESC_CPUID, struct cpu_info)
 #define XGI_IOCTL_MAXNR          30
 
 /*

diff --git a/linux-core/xgi_misc.c b/linux-core/xgi_misc.c
index 6cc0f10..9712241 100644 (file)
--- a/linux-core/xgi_misc.c
+++ b/linux-core/xgi_misc.c
@@ -521,18 +521,6 @@ void xgi_waitfor_pci_idle(struct xgi_info * info)
        }
 }
 
-int xgi_get_cpu_id(struct cpu_info *arg)
-{
-       int op = arg->_eax;
-      __asm__("cpuid":"=a"(arg->_eax),
-               "=b"(arg->_ebx),
-               "=c"(arg->_ecx), "=d"(arg->_edx)
-      :        "0"(op));
-
-       XGI_INFO
-           ("opCode = 0x%x, eax = 0x%x, ebx = 0x%x, ecx = 0x%x, edx = 0x%x \n",
-            op, arg->_eax, arg->_ebx, arg->_ecx, arg->_edx);
-}
 
 /*memory collect function*/
 extern struct list_head xgi_mempid_list;

diff --git a/linux-core/xgi_misc.h b/linux-core/xgi_misc.h
index 4b944c4..85cfbf2 100644 (file)
--- a/linux-core/xgi_misc.h
+++ b/linux-core/xgi_misc.h
@@ -36,7 +36,6 @@ extern void xgi_get_screen_info(struct xgi_info * info, struct xgi_screen_info *
 extern void xgi_put_screen_info(struct xgi_info * info, struct xgi_screen_info * req);
 extern void xgi_ge_reset(struct xgi_info * info);
 extern void xgi_sarea_info(struct xgi_info * info, struct xgi_sarea_info * req);
-extern int xgi_get_cpu_id(struct cpu_info *arg);
 
 extern void xgi_restore_registers(struct xgi_info * info);
 extern bool xgi_ge_irq_handler(struct xgi_info * info);