diff options
author | Davide Ciminaghi <ciminaghi@gnudd.com> | 2012-11-09 09:19:57 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-11-20 06:21:15 -0500 |
commit | 3ce26d2f4b08252edd3ee38a0a6e30a76da9a9fa (patch) | |
tree | 8e735b5d64035318b1646e1102201e09fbe0837d /drivers/mfd/sta2x11-mfd.c | |
parent | 8ec86a302a190bc4864928dd69f3f22066137b68 (diff) |
mfd: sta2x11-mfd: Do not mind about gpio platform data
The gpio platform driver will take care of its platform data,
let's not do any checks here.
Signed-off-by: Davide Ciminaghi <ciminaghi@gnudd.com>
Acked-by: Alessandro Rubini <rubini@gnudd.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/sta2x11-mfd.c')
-rw-r--r-- | drivers/mfd/sta2x11-mfd.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mfd/sta2x11-mfd.c b/drivers/mfd/sta2x11-mfd.c index b981dc4a7b3c..2c8d65e13a67 100644 --- a/drivers/mfd/sta2x11-mfd.c +++ b/drivers/mfd/sta2x11-mfd.c | |||
@@ -553,7 +553,6 @@ static int __devinit sta2x11_mfd_probe(struct pci_dev *pdev, | |||
553 | { | 553 | { |
554 | int err, i; | 554 | int err, i; |
555 | struct sta2x11_mfd_setup_data *setup_data; | 555 | struct sta2x11_mfd_setup_data *setup_data; |
556 | struct sta2x11_gpio_pdata *gpio_data; | ||
557 | 556 | ||
558 | dev_info(&pdev->dev, "%s\n", __func__); | 557 | dev_info(&pdev->dev, "%s\n", __func__); |
559 | 558 | ||
@@ -571,16 +570,6 @@ static int __devinit sta2x11_mfd_probe(struct pci_dev *pdev, | |||
571 | &mfd_setup_data[STA2X11_MFD0] : | 570 | &mfd_setup_data[STA2X11_MFD0] : |
572 | &mfd_setup_data[STA2X11_MFD1]; | 571 | &mfd_setup_data[STA2X11_MFD1]; |
573 | 572 | ||
574 | /* Read gpio config data as pci device's platform data */ | ||
575 | gpio_data = dev_get_platdata(&pdev->dev); | ||
576 | if (!gpio_data) | ||
577 | dev_warn(&pdev->dev, "no gpio configuration\n"); | ||
578 | |||
579 | dev_dbg(&pdev->dev, "%s, gpio_data = %p (%p)\n", __func__, | ||
580 | gpio_data, &gpio_data); | ||
581 | dev_dbg(&pdev->dev, "%s, pdev = %p (%p)\n", __func__, | ||
582 | pdev, &pdev); | ||
583 | |||
584 | /* platform data is the pci device for all of them */ | 573 | /* platform data is the pci device for all of them */ |
585 | sta2x11_mfd_setup(pdev, setup_data); | 574 | sta2x11_mfd_setup(pdev, setup_data); |
586 | 575 | ||