From 1a089b4b47901ac86a45cee62dd6fd2f05bc9969 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Thu, 20 Sep 2012 12:10:57 -0400 Subject: [PATCH] --- yaml --- r: 325443 b: refs/heads/master c: bae95b09076abeecd193a8efbc34c00f4309d3f6 h: refs/heads/master i: 325441: 1846b45a3cd34fccebdc5a128e1899cc89db585f 325439: 60d2a53dec5ba93886dcc63e93b2ecc5ba2edba7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ced1401/usb1401.c | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/[refs] b/[refs] index 1c24d0044018..222914dffaf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2341111f6dcfad5f81d3de21acc43c97ce56ec60 +refs/heads/master: bae95b09076abeecd193a8efbc34c00f4309d3f6 diff --git a/trunk/drivers/staging/ced1401/usb1401.c b/trunk/drivers/staging/ced1401/usb1401.c index 59d69b406a21..6ba0ef652561 100644 --- a/trunk/drivers/staging/ced1401/usb1401.c +++ b/trunk/drivers/staging/ced1401/usb1401.c @@ -261,24 +261,6 @@ static int ced_flush(struct file *file, fl_owner_t id) return res; } -static ssize_t ced_read(struct file *file, char *buffer, size_t count, - loff_t * ppos) -{ - DEVICE_EXTENSION *pdx = file->private_data; - dev_err(&pdx->interface->dev, "%s called: use ioctl for cedusb", - __func__); - return 0; // as we do not do reads this way -} - -static ssize_t ced_write(struct file *file, const char *user_buffer, - size_t count, loff_t * ppos) -{ - DEVICE_EXTENSION *pdx = file->private_data; - dev_err(&pdx->interface->dev, "%s called: use ioctl for cedusb", - __func__); - return 0; -} - /*************************************************************************** ** CanAcceptIoRequests ** If the device is removed, interface is set NULL. We also clear our pointer @@ -1402,8 +1384,6 @@ static int ced_ioctl(struct inode *node, struct file *file, unsigned int cmd, static const struct file_operations ced_fops = { .owner = THIS_MODULE, - .read = ced_read, - .write = ced_write, .open = ced_open, .release = ced_release, .flush = ced_flush,