mfd_get_data() has been removed from the MFD API.
Cc: Anirudh Ghayal <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
---
drivers/input/keyboard/pmic8xxx-keypad.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c
index 40b02ae..6229c3e 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;
--
1.7.2.3
--
Intel Open Source Technology Centre
http://oss.intel.com/
On Wed, Jun 08, 2011 at 11:13:41AM +0200, Samuel Ortiz wrote:
>
> mfd_get_data() has been removed from the MFD API.
>
> Cc: Anirudh Ghayal <[email protected]>
> Signed-off-by: Samuel Ortiz <[email protected]>
Acked-by: Dmitry Torokhov <[email protected]>
Samuel, do you want to push this and the other patch with my acks
through your tree?
Thanks!
--
Dmitry
Hi Dmitry,
On Sat, Jun 11, 2011 at 04:21:46PM -0700, Dmitry Torokhov wrote:
> On Wed, Jun 08, 2011 at 11:13:41AM +0200, Samuel Ortiz wrote:
> >
> > mfd_get_data() has been removed from the MFD API.
> >
> > Cc: Anirudh Ghayal <[email protected]>
> > Signed-off-by: Samuel Ortiz <[email protected]>
>
> Acked-by: Dmitry Torokhov <[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.
--
Intel Open Source Technology Centre
http://oss.intel.com/