forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

mfd: move cpcap to unlocked_ioctl

Browse source 
Change-Id: I2107e164e0d75f1b8e2011e4b28d312308549128
This commit is contained in:
Erik Gilling 2010-08-30 18:14:14 -07:00 • committed by Colin Cross
commit 78a91fa99f
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/mfd/cpcap-core.c
View file

@ -34,8 +34,7 @@ struct cpcap_driver_info {
struct platform_device *pdev;
};
static int ioctl(struct inode *inode,
struct file *file, unsigned int cmd, unsigned long arg);
static long ioctl(struct file *file, unsigned int cmd, unsigned long arg);
static int __devinit cpcap_probe(struct spi_device *spi);
static int __devexit cpcap_remove(struct spi_device *spi);
@ -46,7 +45,7 @@ static int cpcap_resume(struct spi_device *spi);
const static struct file_operations cpcap_fops = {
.owner = THIS_MODULE,
.ioctl = ioctl,
.unlocked_ioctl = ioctl,
};
static struct miscdevice cpcap_dev = {
@ -358,7 +357,7 @@ static int __devexit cpcap_remove(struct spi_device *spi)
}
static int test_ioctl(unsigned int cmd, unsigned long arg)
static long test_ioctl(unsigned int cmd, unsigned long arg)
{
int retval = -EINVAL;
struct cpcap_regacc read_data;
@ -396,7 +395,7 @@ static int test_ioctl(unsigned int cmd, unsigned long arg)
return retval;
}
static int adc_ioctl(unsigned int cmd, unsigned long arg)
static long adc_ioctl(unsigned int cmd, unsigned long arg)
{
int retval = -EINVAL;
struct cpcap_adc_phase phase;
@ -419,7 +418,7 @@ static int adc_ioctl(unsigned int cmd, unsigned long arg)
return retval;
}
static int accy_ioctl(unsigned int cmd, unsigned long arg)
static long accy_ioctl(unsigned int cmd, unsigned long arg)
{
int retval = -EINVAL;
struct cpcap_whisper_request read_data;
@ -442,8 +441,7 @@ static int accy_ioctl(unsigned int cmd, unsigned long arg)
return retval;
}
static int ioctl(struct inode *inode,
struct file *file, unsigned int cmd, unsigned long arg)
static long ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
int retval = -ENOTTY;
unsigned int cmd_num;

9
drivers/mfd/cpcap-uc.c
View file

@ -76,8 +76,7 @@ struct cpcap_uc_data {
static struct cpcap_uc_data *cpcap_uc_info;
static int fops_open(struct inode *inode, struct file *file);
static int fops_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg);
static long fops_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
static ssize_t fops_write(struct file *file, const char *buf,
size_t count, loff_t *ppos);
static ssize_t fops_read(struct file *file, char *buf,
@ -86,7 +85,7 @@ static ssize_t fops_read(struct file *file, char *buf,
static const struct file_operations fops = {
.owner = THIS_MODULE,
.ioctl = fops_ioctl,
.unlocked_ioctl = fops_ioctl,
.open = fops_open,
.read = fops_read,
.write = fops_write,
@ -545,8 +544,8 @@ err:
return retval;
}
static int fops_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
static long fops_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
int retval = -ENOTTY;
struct cpcap_uc_data *data = file->private_data;