Skip to contentSkip to conversation

input: pmic8xxx-keypad: Do not use mfd_get_data()

PATCH In review Samuel Ortiz 2 participants 3 messages Jun 8, 2011 – Jun 14, 2011 Input drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 input: pmic8xxx-keypad: Do not use mfd_get_data()

mfd_get_data() has been removed from the MFD API.

Cc Anirudh Ghayal <[email protected]>
---
 drivers/input/keyboard/pmic8xxx-keypad.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/input/keyboard/pmic8xxx-keypad.c +2 -1
index 40b02ae..6229c3e 100644
@@ -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;
Signature · 5 lines
1.7.2.3

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
#2 lore raw

Hi Dmitry,

Quoted 11 lines · Dmitry Torokhov
Quoted 5 lines · Samuel Ortiz

mfd_get_data() has been removed from the MFD API.

Cc Anirudh Ghayal <[email protected]>

Samuel, do you want to push this and the other patch with my acks through your tree?

Yes, I'd like to do so. I'm hopefully going to be able to find time this week to send an MFD fixes pull request to Linus, and those 2 will be part of it. Thanks for the ACK.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/