aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2011-06-08 11:03:23 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2011-07-05 10:38:43 +0200
commit1d08382a0e8a272fed9517a1b39ae6be634a77d5 (patch)
treecea625af3479b1cdd61ebd8aa4823d9c720fe301 /drivers/input
parentLinux 3.0-rc6 (diff)
downloadlinux-dev-1d08382a0e8a272fed9517a1b39ae6be634a77d5.tar.xz
linux-dev-1d08382a0e8a272fed9517a1b39ae6be634a77d5.zip
input: pmic8xxx-keypad: Do not use mfd_get_data()
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>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/pmic8xxx-keypad.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c
index 40b02ae96f86..6229c3e8e78b 100644
--- 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;