[ARM] pxa: fix mci_init functions returning -1

Fix all those PXA mci_init functions which return -1 rather than
propagating the error code to the higher levels.  Remove the silly
set_irq_type() calls as well - use the flags for request_irq()
instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
index a16349272f54..28cfd71c032d 100644
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
@@ -487,18 +487,15 @@ static int cmx270_mci_init(struct device *dev,
 
         /* card detect IRQ on GPIO 83 */
         pxa_gpio_mode(IRQ_TO_GPIO(CMX270_MMC_IRQ));
-        set_irq_type(CMX270_MMC_IRQ, IRQT_FALLING);
 
         err = request_irq(CMX270_MMC_IRQ, cmx270_detect_int,
                           IRQF_DISABLED | IRQF_TRIGGER_FALLING,
                           "MMC card detect", data);
-        if (err) {
+        if (err)
                 printk(KERN_ERR "cmx270_mci_init: MMC/SD: can't"
                        " request MMC card detect IRQ\n");
-                return -1;
-        }
 
-        return 0;
+        return err;
 }
 
 static void cmx270_mci_setpower(struct device *dev, unsigned int vdd)