Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16821
b: refs/heads/master
c: 70c00ba
h: refs/heads/master
i:
  16819: 0b8ccc9
v: v3
  • Loading branch information
Marcelo Tosatti authored and Linus Torvalds committed Jan 9, 2006
1 parent 965ceb4 commit a8bec90
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 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: 5998bf1ddb5fb236597190b2274d357add63fd7e
refs/heads/master: 70c00ba0bbfb583e39b964ebd88620c18aa02c62
9 changes: 1 addition & 8 deletions trunk/drivers/input/misc/hp_sdc_rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ static struct fasync_struct *hp_sdc_rtc_async_queue;

static DECLARE_WAIT_QUEUE_HEAD(hp_sdc_rtc_wait);

static loff_t hp_sdc_rtc_llseek(struct file *file, loff_t offset, int origin);

static ssize_t hp_sdc_rtc_read(struct file *file, char *buf,
size_t count, loff_t *ppos);

Expand Down Expand Up @@ -387,11 +385,6 @@ static int hp_sdc_rtc_set_i8042timer (struct timeval *setto, uint8_t setcmd)
return 0;
}

static loff_t hp_sdc_rtc_llseek(struct file *file, loff_t offset, int origin)
{
return -ESPIPE;
}

static ssize_t hp_sdc_rtc_read(struct file *file, char *buf,
size_t count, loff_t *ppos) {
ssize_t retval;
Expand Down Expand Up @@ -679,7 +672,7 @@ static int hp_sdc_rtc_ioctl(struct inode *inode, struct file *file,

static struct file_operations hp_sdc_rtc_fops = {
.owner = THIS_MODULE,
.llseek = hp_sdc_rtc_llseek,
.llseek = no_llseek,
.read = hp_sdc_rtc_read,
.poll = hp_sdc_rtc_poll,
.ioctl = hp_sdc_rtc_ioctl,
Expand Down

0 comments on commit a8bec90

Please sign in to comment.