projects
/
profile
/
common
/
kernel-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe0d422
)
input: pmic8xxx-keypad: Do not use mfd_get_data()
author
Samuel Ortiz
<sameo@linux.intel.com>
Wed, 8 Jun 2011 09:03:23 +0000
(11:03 +0200)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Tue, 5 Jul 2011 08:38:43 +0000
(10:38 +0200)
mfd_get_data() has been removed from the MFD API.
Cc: Anirudh Ghayal <aghayal@codeaurora.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/input/keyboard/pmic8xxx-keypad.c
patch
|
blob
|
history
diff --git
a/drivers/input/keyboard/pmic8xxx-keypad.c
b/drivers/input/keyboard/pmic8xxx-keypad.c
index
40b02ae
..
6229c3e
100644
(file)
--- a/
drivers/input/keyboard/pmic8xxx-keypad.c
+++ b/
drivers/input/keyboard/pmic8xxx-keypad.c
@@
-520,7
+520,8
@@
static void pmic8xxx_kp_close(struct input_dev *dev)
*/
static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev)
{
- const struct pm8xxx_keypad_platform_data *pdata = mfd_get_data(pdev);
+ const struct pm8xxx_keypad_platform_data *pdata =
+ dev_get_platdata(&pdev->dev);
const struct matrix_keymap_data *keymap_data;
struct pmic8xxx_kp *kp;
int rc;