diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-05 18:30:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-05 18:30:34 -0400 |
commit | 5d32c88f0b94061b3af2e3ade92422407282eb12 (patch) | |
tree | 2e1f81aa47b2cf59625c8fba17199617e33802e6 /drivers/mfd | |
parent | 43f63c8711ce02226b7bbdafeba7b8031faf3fb4 (diff) | |
parent | dac23b0d0513916498d40412818bd2c581b365f7 (diff) |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge batch of fixes from Andrew Morton:
"The simple_open() cleanup was held back while I wanted for laggards to
merge things.
I still need to send a few checkpoint/restore patches. I've been
wobbly about merging them because I'm wobbly about the overall
prospects for success of the project. But after speaking with Pavel
at the LSF conference, it sounds like they're further toward
completion than I feared - apparently davem is at the "has stopped
complaining" stage regarding the net changes. So I need to go back
and re-review those patchs and their (lengthy) discussion."
* emailed from Andrew Morton <akpm@linux-foundation.org>: (16 patches)
memcg swap: use mem_cgroup_uncharge_swap fix
backlight: add driver for DA9052/53 PMIC v1
C6X: use set_current_blocked() and block_sigmask()
MAINTAINERS: add entry for sparse checker
MAINTAINERS: fix REMOTEPROC F: typo
alpha: use set_current_blocked() and block_sigmask()
simple_open: automatically convert to simple_open()
scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_open()
libfs: add simple_open()
hugetlbfs: remove unregister_filesystem() when initializing module
drivers/rtc/rtc-88pm860x.c: fix rtc irq enable callback
fs/xattr.c:setxattr(): improve handling of allocation failures
fs/xattr.c:listxattr(): fall back to vmalloc() if kmalloc() failed
fs/xattr.c: suppress page allocation failure warnings from sys_listxattr()
sysrq: use SEND_SIG_FORCED instead of force_sig()
proc: fix mount -t proc -o AAA
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/aat2870-core.c | 9 | ||||
-rw-r--r-- | drivers/mfd/ab3100-core.c | 8 |
2 files changed, 2 insertions, 15 deletions
diff --git a/drivers/mfd/aat2870-core.c b/drivers/mfd/aat2870-core.c index 3aa36eb5c79b..44a3fdbadef4 100644 --- a/drivers/mfd/aat2870-core.c +++ b/drivers/mfd/aat2870-core.c | |||
@@ -262,13 +262,6 @@ static ssize_t aat2870_dump_reg(struct aat2870_data *aat2870, char *buf) | |||
262 | return count; | 262 | return count; |
263 | } | 263 | } |
264 | 264 | ||
265 | static int aat2870_reg_open_file(struct inode *inode, struct file *file) | ||
266 | { | ||
267 | file->private_data = inode->i_private; | ||
268 | |||
269 | return 0; | ||
270 | } | ||
271 | |||
272 | static ssize_t aat2870_reg_read_file(struct file *file, char __user *user_buf, | 265 | static ssize_t aat2870_reg_read_file(struct file *file, char __user *user_buf, |
273 | size_t count, loff_t *ppos) | 266 | size_t count, loff_t *ppos) |
274 | { | 267 | { |
@@ -330,7 +323,7 @@ static ssize_t aat2870_reg_write_file(struct file *file, | |||
330 | } | 323 | } |
331 | 324 | ||
332 | static const struct file_operations aat2870_reg_fops = { | 325 | static const struct file_operations aat2870_reg_fops = { |
333 | .open = aat2870_reg_open_file, | 326 | .open = simple_open, |
334 | .read = aat2870_reg_read_file, | 327 | .read = aat2870_reg_read_file, |
335 | .write = aat2870_reg_write_file, | 328 | .write = aat2870_reg_write_file, |
336 | }; | 329 | }; |
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c index 60107ee166fc..1efad20fb175 100644 --- a/drivers/mfd/ab3100-core.c +++ b/drivers/mfd/ab3100-core.c | |||
@@ -483,12 +483,6 @@ struct ab3100_get_set_reg_priv { | |||
483 | bool mode; | 483 | bool mode; |
484 | }; | 484 | }; |
485 | 485 | ||
486 | static int ab3100_get_set_reg_open_file(struct inode *inode, struct file *file) | ||
487 | { | ||
488 | file->private_data = inode->i_private; | ||
489 | return 0; | ||
490 | } | ||
491 | |||
492 | static ssize_t ab3100_get_set_reg(struct file *file, | 486 | static ssize_t ab3100_get_set_reg(struct file *file, |
493 | const char __user *user_buf, | 487 | const char __user *user_buf, |
494 | size_t count, loff_t *ppos) | 488 | size_t count, loff_t *ppos) |
@@ -583,7 +577,7 @@ static ssize_t ab3100_get_set_reg(struct file *file, | |||
583 | } | 577 | } |
584 | 578 | ||
585 | static const struct file_operations ab3100_get_set_reg_fops = { | 579 | static const struct file_operations ab3100_get_set_reg_fops = { |
586 | .open = ab3100_get_set_reg_open_file, | 580 | .open = simple_open, |
587 | .write = ab3100_get_set_reg, | 581 | .write = ab3100_get_set_reg, |
588 | .llseek = noop_llseek, | 582 | .llseek = noop_llseek, |
589 | }; | 583 | }; |