Commit bdd4a571 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: kpc2000: remove fileops.c file. 



The fileops.c file does not need to be stand-alone, so move it into the
core.c file.  This lets us make some functions static, reducing the
global namespace of the driver.

Cc: Matt Sickler <Matt.Sickler@daktronics.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e23fa431

drivers/staging/kpc2000/kpc2000/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



obj-m := kpc2000.o

kpc2000-objs += core.o  cell_probe.o  fileops.o
 
kpc2000-objs += core.o  cell_probe.o

drivers/staging/kpc2000/kpc2000/core.c

+113 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/types.h>

#include <linux/export.h>

#include <linux/slab.h>

#include <linux/fs.h>

#include <linux/errno.h>

#include <linux/cdev.h>

#include <linux/rwsem.h>

#include <linux/uaccess.h>

#include <asm/io.h>

#include <linux/io.h>

#include <linux/mfd/core.h>
@@ -17,7 +23,7 @@ 
#include <linux/sched.h>

#include <linux/jiffies.h>

#include "pcie.h"



#include "uapi.h"



/*******************************************************

  * SysFS Attributes
@@ -198,6 +204,112 @@ irqreturn_t kp2000_irq_handler(int irq, void *dev_id) 
    return IRQ_HANDLED;

}



static int kp2000_cdev_open(struct inode *inode, struct file *filp)

{

	struct kp2000_device *pcard = container_of(filp->private_data, struct kp2000_device, miscdev);



	dev_dbg(&pcard->pdev->dev, "kp2000_cdev_open(filp = [%p], pcard = [%p])\n", filp, pcard);



	filp->private_data = pcard; /* so other methods can access it */



	return 0;

}



static int kp2000_cdev_close(struct inode *inode, struct file *filp)

{

	struct kp2000_device *pcard = filp->private_data;



	dev_dbg(&pcard->pdev->dev, "kp2000_cdev_close(filp = [%p], pcard = [%p])\n", filp, pcard);

	return 0;

}





static ssize_t kp2000_cdev_read(struct file *filp, char __user *buf,

				size_t count, loff_t *f_pos)

{

	struct kp2000_device *pcard = filp->private_data;

	int cnt = 0;

	int ret;

#define BUFF_CNT  1024

	char buff[BUFF_CNT] = {0}; //NOTE: Increase this so it is at least as large as all the scnprintfs.  And don't use unbounded strings. "%s"

	//NOTE: also, this is a really shitty way to implement the read() call, but it will work for any size 'count'.



	if (WARN(NULL == buf, "kp2000_cdev_read: buf is a NULL pointer!\n"))

		return -EINVAL;



	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Card ID                 : 0x%08x\n", pcard->card_id);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Build Version           : 0x%08x\n", pcard->build_version);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Build Date              : 0x%08x\n", pcard->build_datestamp);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Build Time              : 0x%08x\n", pcard->build_timestamp);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Core Table Offset       : 0x%08x\n", pcard->core_table_offset);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Core Table Length       : 0x%08x\n", pcard->core_table_length);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Hardware Revision       : 0x%08x\n", pcard->hardware_revision);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "SSID                    : 0x%016llx\n", pcard->ssid);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "DDNA                    : 0x%016llx\n", pcard->ddna);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "IRQ Mask                : 0x%016llx\n", readq(pcard->sysinfo_regs_base + REG_INTERRUPT_MASK));

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "IRQ Active              : 0x%016llx\n", readq(pcard->sysinfo_regs_base + REG_INTERRUPT_ACTIVE));

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "CPLD                    : 0x%016llx\n", readq(pcard->sysinfo_regs_base + REG_CPLD_CONFIG));



	if (*f_pos >= cnt)

		return 0;



	if (count > cnt)

		count = cnt;



	ret = copy_to_user(buf, buff + *f_pos, count);

	if (ret)

		return -EFAULT;

	*f_pos += count;

	return count;

}



static long kp2000_cdev_ioctl(struct file *filp, unsigned int ioctl_num,

			      unsigned long ioctl_param)

{

	struct kp2000_device *pcard = filp->private_data;



	dev_dbg(&pcard->pdev->dev, "kp2000_cdev_ioctl(filp = [%p], ioctl_num = 0x%08x, ioctl_param = 0x%016lx) pcard = [%p]\n", filp, ioctl_num, ioctl_param, pcard);



	switch (ioctl_num){

	case KP2000_IOCTL_GET_CPLD_REG:             return readq(pcard->sysinfo_regs_base + REG_CPLD_CONFIG);

	case KP2000_IOCTL_GET_PCIE_ERROR_REG:       return readq(pcard->sysinfo_regs_base + REG_PCIE_ERROR_COUNT);



	case KP2000_IOCTL_GET_EVERYTHING: {

		struct kp2000_regs temp;

		int ret;



		memset(&temp, 0, sizeof(temp));

		temp.card_id = pcard->card_id;

		temp.build_version = pcard->build_version;

		temp.build_datestamp = pcard->build_datestamp;

		temp.build_timestamp = pcard->build_timestamp;

		temp.hw_rev = pcard->hardware_revision;

		temp.ssid = pcard->ssid;

		temp.ddna = pcard->ddna;

		temp.cpld_reg = readq(pcard->sysinfo_regs_base + REG_CPLD_CONFIG);



		ret = copy_to_user((void*)ioctl_param, (void*)&temp, sizeof(temp));

		if (ret)

			return -EFAULT;



		return sizeof(temp);

		}



	default:

		return -ENOTTY;

	}

	return -ENOTTY;

}



static struct file_operations kp2000_fops = {

	.owner =		THIS_MODULE,

	.open =			kp2000_cdev_open,

	.release =		kp2000_cdev_close,

	.read =			kp2000_cdev_read,

	.llseek =		noop_llseek,

	.unlocked_ioctl =	kp2000_cdev_ioctl,

};



static int kp2000_pcie_probe(struct pci_dev *pdev,

			     const struct pci_device_id *id)

{

drivers/staging/kpc2000/kpc2000/fileops.c

deleted100644 → 0
+0 −123
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

#include <linux/module.h>

#include <linux/init.h>

#include <linux/kernel.h>   /* printk() */

#include <linux/slab.h>     /* kmalloc() */

#include <linux/fs.h>       /* everything... */

#include <linux/errno.h>    /* error codes */

#include <linux/types.h>    /* size_t */

#include <linux/cdev.h>

#include <linux/uaccess.h>    /* copy_*_user */

#include <linux/rwsem.h>

#include <linux/idr.h>

#include <linux/io-64-nonatomic-lo-hi.h>

#include <linux/device.h>

#include <linux/sched.h>

#include "pcie.h"

#include "uapi.h"



int  kp2000_cdev_open(struct inode *inode, struct file *filp)

{

	struct kp2000_device *pcard = container_of(filp->private_data, struct kp2000_device, miscdev);



	dev_dbg(&pcard->pdev->dev, "kp2000_cdev_open(filp = [%p], pcard = [%p])\n", filp, pcard);



	filp->private_data = pcard; /* so other methods can access it */



	return 0;

}



int  kp2000_cdev_close(struct inode *inode, struct file *filp)

{

	struct kp2000_device *pcard = filp->private_data;



	dev_dbg(&pcard->pdev->dev, "kp2000_cdev_close(filp = [%p], pcard = [%p])\n", filp, pcard);

	return 0;

}





ssize_t  kp2000_cdev_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos)

{

	struct kp2000_device *pcard = filp->private_data;

	int cnt = 0;

	int ret;

#define BUFF_CNT  1024

	char buff[BUFF_CNT] = {0}; //NOTE: Increase this so it is at least as large as all the scnprintfs.  And don't use unbounded strings. "%s"

	//NOTE: also, this is a really shitty way to implement the read() call, but it will work for any size 'count'.



	if (WARN(NULL == buf, "kp2000_cdev_read: buf is a NULL pointer!\n"))

		return -EINVAL;



	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Card ID                 : 0x%08x\n", pcard->card_id);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Build Version           : 0x%08x\n", pcard->build_version);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Build Date              : 0x%08x\n", pcard->build_datestamp);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Build Time              : 0x%08x\n", pcard->build_timestamp);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Core Table Offset       : 0x%08x\n", pcard->core_table_offset);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Core Table Length       : 0x%08x\n", pcard->core_table_length);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "Hardware Revision       : 0x%08x\n", pcard->hardware_revision);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "SSID                    : 0x%016llx\n", pcard->ssid);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "DDNA                    : 0x%016llx\n", pcard->ddna);

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "IRQ Mask                : 0x%016llx\n", readq(pcard->sysinfo_regs_base + REG_INTERRUPT_MASK));

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "IRQ Active              : 0x%016llx\n", readq(pcard->sysinfo_regs_base + REG_INTERRUPT_ACTIVE));

	cnt += scnprintf(buff+cnt, BUFF_CNT-cnt, "CPLD                    : 0x%016llx\n", readq(pcard->sysinfo_regs_base + REG_CPLD_CONFIG));



	if (*f_pos >= cnt)

		return 0;



	if (count > cnt)

		count = cnt;



	ret = copy_to_user(buf, buff + *f_pos, count);

	if (ret)

		return -EFAULT;

	*f_pos += count;

	return count;

}



long  kp2000_cdev_ioctl(struct file *filp, unsigned int ioctl_num, unsigned long ioctl_param)

{

	struct kp2000_device *pcard = filp->private_data;



	dev_dbg(&pcard->pdev->dev, "kp2000_cdev_ioctl(filp = [%p], ioctl_num = 0x%08x, ioctl_param = 0x%016lx) pcard = [%p]\n", filp, ioctl_num, ioctl_param, pcard);



	switch (ioctl_num){

	case KP2000_IOCTL_GET_CPLD_REG:             return readq(pcard->sysinfo_regs_base + REG_CPLD_CONFIG);

	case KP2000_IOCTL_GET_PCIE_ERROR_REG:       return readq(pcard->sysinfo_regs_base + REG_PCIE_ERROR_COUNT);



	case KP2000_IOCTL_GET_EVERYTHING: {

		struct kp2000_regs temp;

		int ret;



		memset(&temp, 0, sizeof(temp));

		temp.card_id = pcard->card_id;

		temp.build_version = pcard->build_version;

		temp.build_datestamp = pcard->build_datestamp;

		temp.build_timestamp = pcard->build_timestamp;

		temp.hw_rev = pcard->hardware_revision;

		temp.ssid = pcard->ssid;

		temp.ddna = pcard->ddna;

		temp.cpld_reg = readq(pcard->sysinfo_regs_base + REG_CPLD_CONFIG);



		ret = copy_to_user((void*)ioctl_param, (void*)&temp, sizeof(temp));

		if (ret)

			return -EFAULT;



		return sizeof(temp);

		}



	default:

		return -ENOTTY;

	}

	return -ENOTTY;

}





struct file_operations  kp2000_fops = {

	.owner      = THIS_MODULE,

	.open       = kp2000_cdev_open,

	.release    = kp2000_cdev_close,

	.read       = kp2000_cdev_read,

	.llseek     = noop_llseek,

	.unlocked_ioctl = kp2000_cdev_ioctl,

};

drivers/staging/kpc2000/kpc2000/pcie.h

+0 −3
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ extern struct attribute *kpc_uio_class_attrs[]; 
int   kp2000_probe_cores(struct kp2000_device *pcard);

void  kp2000_remove_cores(struct kp2000_device *pcard);



extern struct file_operations  kp2000_fops;





// Define this quick little macro because the expression is used frequently

#define PCARD_TO_DEV(pcard)  (&(pcard->pdev->dev))