Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325443
b: refs/heads/master
c: bae95b0
h: refs/heads/master
i:
  325441: 1846b45
  325439: 60d2a53
v: v3
  • Loading branch information
Devendra Naga authored and Greg Kroah-Hartman committed Sep 21, 2012
1 parent 9bed330 commit 1a089b4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2341111f6dcfad5f81d3de21acc43c97ce56ec60
refs/heads/master: bae95b09076abeecd193a8efbc34c00f4309d3f6
20 changes: 0 additions & 20 deletions trunk/drivers/staging/ced1401/usb1401.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 1a089b4

Please sign in to comment.