Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2687bd38 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ca4d6cfc

arch/arm/mach-pxa/cm-x270.c

+2 −5
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-pxa/corgi.c

+2 −4
Original line number Diff line number Diff line
@@ -419,12 +419,10 @@ static int corgi_mci_init(struct device *dev, irq_handler_t corgi_detect_int, vo 
	err = request_irq(CORGI_IRQ_GPIO_nSD_DETECT, corgi_detect_int,

			  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

			  "MMC card detect", data);

	if (err) {

	if (err)

		printk(KERN_ERR "corgi_mci_init: MMC/SD: can't request MMC card detect IRQ\n");

		return -1;

	}



	return 0;

	return err;

}



static void corgi_mci_setpower(struct device *dev, unsigned int vdd)

arch/arm/mach-pxa/mainstone.c

+2 −4
Original line number Diff line number Diff line
@@ -379,12 +379,10 @@ static int mainstone_mci_init(struct device *dev, irq_handler_t mstone_detect_in 


	err = request_irq(MAINSTONE_MMC_IRQ, mstone_detect_int, IRQF_DISABLED,

			     "MMC card detect", data);

	if (err) {

	if (err)

		printk(KERN_ERR "mainstone_mci_init: MMC/SD: can't request MMC card detect IRQ\n");

		return -1;

	}



	return 0;

	return err;

}



static void mainstone_mci_setpower(struct device *dev, unsigned int vdd)

arch/arm/mach-pxa/poodle.c

+2 −4
Original line number Diff line number Diff line
@@ -215,12 +215,10 @@ static int poodle_mci_init(struct device *dev, irq_handler_t poodle_detect_int, 
	err = request_irq(POODLE_IRQ_GPIO_nSD_DETECT, poodle_detect_int,

			  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

			  "MMC card detect", data);

	if (err) {

	if (err)

		printk(KERN_ERR "poodle_mci_init: MMC/SD: can't request MMC card detect IRQ\n");

		return -1;

	}



	return 0;

	return err;

}



static void poodle_mci_setpower(struct device *dev, unsigned int vdd)

arch/arm/mach-pxa/spitz.c

+2 −4
Original line number Diff line number Diff line
@@ -374,12 +374,10 @@ static int spitz_mci_init(struct device *dev, irq_handler_t spitz_detect_int, vo 
	err = request_irq(SPITZ_IRQ_GPIO_nSD_DETECT, spitz_detect_int,

			  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

			  "MMC card detect", data);

	if (err) {

	if (err)

		printk(KERN_ERR "spitz_mci_init: MMC/SD: can't request MMC card detect IRQ\n");

		return -1;

	}



	return 0;

	return err;

}



static void spitz_mci_setpower(struct device *dev, unsigned int vdd)