[PATCH 1/4] staging: unisys: remove virthba proc
This patch removes all proc entries, directories, and functions Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com Signed-off-by: Benjamin Romer benjamin.ro...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 206 --- 1 file changed, 206 deletions(-) diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index 4d1347a..b9cbcf2 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -50,7 +50,6 @@ #include scsi/scsi_cmnd.h #include scsi/scsi_device.h #include asm/param.h -#include linux/proc_fs.h #include linux/types.h #include virthba.h @@ -106,15 +105,6 @@ static int virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state); static void doDiskAddRemove(struct work_struct *work); static void virthba_serverdown_complete(struct work_struct *work); -static ssize_t info_proc_read(struct file *file, char __user *buf, - size_t len, loff_t *offset); -static ssize_t rqwu_proc_write(struct file *file, const char __user *buffer, - size_t count, loff_t *ppos); -static ssize_t enable_ints_read(struct file *file, char __user *buffer, - size_t count, loff_t *ppos); -static ssize_t enable_ints_write(struct file *file, const char __user *buffer, -size_t count, loff_t *ppos); - /*/ /* Globals */ /*/ @@ -208,7 +198,6 @@ struct diskaddremove { static DEVICE_ATTRIBUTE *virthba_shost_attrs[]; static struct scsi_host_template virthba_driver_template = { .name = Unisys Virtual HBA, - .proc_name = uisvirthba, .info = virthba_get_info, .ioctl = virthba_ioctl, .queuecommand = virthba_queue_command, @@ -232,31 +221,9 @@ struct virthba_devices_open { struct virthba_info *virthbainfo; }; -static const struct file_operations proc_info_fops = { - .read = info_proc_read, -}; - -static const struct file_operations proc_rqwu_fops = { - .write = rqwu_proc_write, -}; - -static const struct file_operations proc_enable_ints_fops = { - .read = enable_ints_read, - .write = enable_ints_write, -}; - - #define VIRTHBASOPENMAX 1 /* array of open devices maintained by open() and close(); */ static struct virthba_devices_open VirtHbasOpen[VIRTHBASOPENMAX]; -static struct proc_dir_entry *virthba_proc_dir; -static struct proc_dir_entry *info_proc_entry; -static struct proc_dir_entry *rqwaitus_proc_entry; -static struct proc_dir_entry *enable_ints_proc_entry; -#define INFO_PROC_ENTRY_FN info -#define ENABLE_INTS_ENTRY_FN enable_ints -#define RQWU_PROC_ENTRY_FN rqwait_usecs -#define DIR_PROC_ENTRY virthba /*/ /* Local Functions */ @@ -1375,156 +1342,6 @@ process_incoming_rsps(void *v) complete_and_exit(dc-threadinfo.has_stopped, 0); } -/*/ -/* proc filesystem functions*/ -/*/ - -static ssize_t -info_proc_read(struct file *file, char __user *buf, size_t len, loff_t *offset) -{ - int length = 0; - U64 phys_flags_addr; - int i; - struct virthba_info *virthbainfo; - char *vbuf; - loff_t pos = *offset; - - if (pos 0) - return -EINVAL; - - if (pos 0 || !len) - return 0; - - vbuf = kzalloc(len, GFP_KERNEL); - if (!vbuf) - return -ENOMEM; - - for (i = 0; i VIRTHBASOPENMAX; i++) { - if (VirtHbasOpen[i].virthbainfo == NULL) - continue; - - virthbainfo = VirtHbasOpen[i].virthbainfo; - length += sprintf(vbuf + length, CHANSOCK is not defined.\n); - - length += sprintf(vbuf + length, MaxBuffLen:%u\n, MaxBuffLen); - - length += sprintf(vbuf + length, \nvirthba result queue poll wait:%d usecs.\n, - rsltq_wait_usecs); - - length += sprintf(vbuf + length, \ninterrupts_rcvd = %llu, interrupts_disabled = %llu\n, - virthbainfo-interrupts_rcvd, - virthbainfo-interrupts_disabled); - length += sprintf(vbuf + length, \ninterrupts_notme = %llu,\n, - virthbainfo-interrupts_notme); - phys_flags_addr = virt_to_phys((__force void *) - virthbainfo-flags_addr); - length += sprintf(vbuf + length, flags_addr = %p, phys_flags_addr=0x%016llx, FeatureFlags=%llu\n, - virthbainfo-flags_addr, phys_flags_addr,
[PATCH 1/4] staging: unisys: remove virthba proc
This patch removes all proc entries, directories, and functions Signed-off-by: Erik Arfvidson erik.arfvid...@unisys.com --- drivers/staging/unisys/virthba/virthba.c | 206 --- 1 file changed, 206 deletions(-) diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index 4d1347a..b9cbcf2 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -50,7 +50,6 @@ #include scsi/scsi_cmnd.h #include scsi/scsi_device.h #include asm/param.h -#include linux/proc_fs.h #include linux/types.h #include virthba.h @@ -106,15 +105,6 @@ static int virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state); static void doDiskAddRemove(struct work_struct *work); static void virthba_serverdown_complete(struct work_struct *work); -static ssize_t info_proc_read(struct file *file, char __user *buf, - size_t len, loff_t *offset); -static ssize_t rqwu_proc_write(struct file *file, const char __user *buffer, - size_t count, loff_t *ppos); -static ssize_t enable_ints_read(struct file *file, char __user *buffer, - size_t count, loff_t *ppos); -static ssize_t enable_ints_write(struct file *file, const char __user *buffer, -size_t count, loff_t *ppos); - /*/ /* Globals */ /*/ @@ -208,7 +198,6 @@ struct diskaddremove { static DEVICE_ATTRIBUTE *virthba_shost_attrs[]; static struct scsi_host_template virthba_driver_template = { .name = Unisys Virtual HBA, - .proc_name = uisvirthba, .info = virthba_get_info, .ioctl = virthba_ioctl, .queuecommand = virthba_queue_command, @@ -232,31 +221,9 @@ struct virthba_devices_open { struct virthba_info *virthbainfo; }; -static const struct file_operations proc_info_fops = { - .read = info_proc_read, -}; - -static const struct file_operations proc_rqwu_fops = { - .write = rqwu_proc_write, -}; - -static const struct file_operations proc_enable_ints_fops = { - .read = enable_ints_read, - .write = enable_ints_write, -}; - - #define VIRTHBASOPENMAX 1 /* array of open devices maintained by open() and close(); */ static struct virthba_devices_open VirtHbasOpen[VIRTHBASOPENMAX]; -static struct proc_dir_entry *virthba_proc_dir; -static struct proc_dir_entry *info_proc_entry; -static struct proc_dir_entry *rqwaitus_proc_entry; -static struct proc_dir_entry *enable_ints_proc_entry; -#define INFO_PROC_ENTRY_FN info -#define ENABLE_INTS_ENTRY_FN enable_ints -#define RQWU_PROC_ENTRY_FN rqwait_usecs -#define DIR_PROC_ENTRY virthba /*/ /* Local Functions */ @@ -1375,156 +1342,6 @@ process_incoming_rsps(void *v) complete_and_exit(dc-threadinfo.has_stopped, 0); } -/*/ -/* proc filesystem functions*/ -/*/ - -static ssize_t -info_proc_read(struct file *file, char __user *buf, size_t len, loff_t *offset) -{ - int length = 0; - U64 phys_flags_addr; - int i; - struct virthba_info *virthbainfo; - char *vbuf; - loff_t pos = *offset; - - if (pos 0) - return -EINVAL; - - if (pos 0 || !len) - return 0; - - vbuf = kzalloc(len, GFP_KERNEL); - if (!vbuf) - return -ENOMEM; - - for (i = 0; i VIRTHBASOPENMAX; i++) { - if (VirtHbasOpen[i].virthbainfo == NULL) - continue; - - virthbainfo = VirtHbasOpen[i].virthbainfo; - length += sprintf(vbuf + length, CHANSOCK is not defined.\n); - - length += sprintf(vbuf + length, MaxBuffLen:%u\n, MaxBuffLen); - - length += sprintf(vbuf + length, \nvirthba result queue poll wait:%d usecs.\n, - rsltq_wait_usecs); - - length += sprintf(vbuf + length, \ninterrupts_rcvd = %llu, interrupts_disabled = %llu\n, - virthbainfo-interrupts_rcvd, - virthbainfo-interrupts_disabled); - length += sprintf(vbuf + length, \ninterrupts_notme = %llu,\n, - virthbainfo-interrupts_notme); - phys_flags_addr = virt_to_phys((__force void *) - virthbainfo-flags_addr); - length += sprintf(vbuf + length, flags_addr = %p, phys_flags_addr=0x%016llx, FeatureFlags=%llu\n, - virthbainfo-flags_addr, phys_flags_addr, -
Re: [PATCH 1/4] staging: unisys: remove virthba proc
On Mon, Jul 21, 2014 at 02:47:42PM -0400, Erik Arfvidson wrote: This patch removes all proc entries, directories, and functions A better Subject would be: staging: unisys: remove virthba proc files right? ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel