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

Commit 9b6d99f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/~dhowells/irq-2.6 

* git://git.infradead.org/~dhowells/irq-2.6:
  IRQ: Use the new typedef for interrupt handler function pointers
parents 5a43c09d 40220c1a

arch/arm/mach-pxa/corgi.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static struct platform_device corgits_device = { 
 */

static struct pxamci_platform_data corgi_mci_platform_data;



static int corgi_mci_init(struct device *dev, irqreturn_t (*corgi_detect_int)(int, void *), void *data)

static int corgi_mci_init(struct device *dev, irq_handler_t corgi_detect_int, void *data)

{

	int err;

arch/arm/mach-pxa/idp.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static struct pxafb_mach_info sharp_lm8v31 = { 
	.pxafb_lcd_power = &idp_lcd_power

};



static int idp_mci_init(struct device *dev, irqreturn_t (*idp_detect_int)(int, void *), void *data)

static int idp_mci_init(struct device *dev, irq_handler_t idp_detect_int, void *data)

{

	/* setup GPIO for PXA25x MMC controller	*/

	pxa_gpio_mode(GPIO6_MMCCLK_MD);

arch/arm/mach-pxa/lubbock.c

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static struct pxafb_mach_info sharp_lm8v31 = { 
#define	MMC_POLL_RATE		msecs_to_jiffies(1000)



static void lubbock_mmc_poll(unsigned long);

static irqreturn_t (*mmc_detect_int)(int, void *);

static irq_handler_t mmc_detect_int;



static struct timer_list mmc_timer = {

	.function	= lubbock_mmc_poll,
@@ -412,7 +412,7 @@ static irqreturn_t lubbock_detect_int(int irq, void *data) 
}



static int lubbock_mci_init(struct device *dev,

		irqreturn_t (*detect_int)(int, void *),

		irq_handler_t detect_int,

		void *data)

{

	/* setup GPIO for PXA25x MMC controller	*/

arch/arm/mach-pxa/mainstone.c

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static struct pxafb_mach_info mainstone_pxafb_info = { 
	.pxafb_backlight_power	= mainstone_backlight_power,

};



static int mainstone_mci_init(struct device *dev, irqreturn_t (*mstone_detect_int)(int, void *), void *data)

static int mainstone_mci_init(struct device *dev, irq_handler_t mstone_detect_int, void *data)

{

	int err;

arch/arm/mach-pxa/poodle.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static struct platform_device poodle_ts_device = { 
 */

static struct pxamci_platform_data poodle_mci_platform_data;



static int poodle_mci_init(struct device *dev, irqreturn_t (*poodle_detect_int)(int, void *), void *data)

static int poodle_mci_init(struct device *dev, irq_handler_t poodle_detect_int, void *data)

{

	int err;