Skip to contentSkip to conversation

Fix spitzkbd compile warnings

PATCH In review Richard Purdie 2 participants 2 messages May 13, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix spitzkbd compile warnings

Fix compile warnings from spitzkbd.c. Registration failure of these IRQs isn't fatal so just warn about it.

drivers/input/keyboard/spitzkbd.c +15 -10
index 41b8038..a609d43 100644
@@ -418,21 +418,26 @@ static int __init spitzkbd_probe(struct platform_device *dev)
 	pxa_gpio_mode(SPITZ_GPIO_SWA | GPIO_IN);
 	pxa_gpio_mode(SPITZ_GPIO_SWB | GPIO_IN);
 
-	request_irq(SPITZ_IRQ_GPIO_SYNC, spitzkbd_interrupt,
+	if (request_irq(SPITZ_IRQ_GPIO_SYNC, spitzkbd_interrupt,
 		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-		    "Spitzkbd Sync", spitzkbd);
-	request_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd_interrupt,
+		    "Spitzkbd Sync", spitzkbd))
+		printk(KERN_WARNING "spitzkbd: Failed to request sync IRQ\n");
+	if (request_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd_interrupt,
 		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-		    "Spitzkbd PwrOn", spitzkbd);
-	request_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd_hinge_isr,
+		    "Spitzkbd PwrOn", spitzkbd))
+		printk(KERN_WARNING "spitzkbd: Failed to request GPIO IRQ\n");
+	if (request_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd_hinge_isr,
 		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-		    "Spitzkbd SWA", spitzkbd);
-	request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr,
+		    "Spitzkbd SWA", spitzkbd))
+		printk(KERN_WARNING "spitzkbd: Failed to request SWA IRQ\n");
+	if (request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr,
 		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-		    "Spitzkbd SWB", spitzkbd);
-	request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr,
+		    "Spitzkbd SWB", spitzkbd))
+		printk(KERN_WARNING "spitzkbd: Failed to request SWB IRQ\n");
+	if (request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr,
 		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-		    "Spitzkbd HP", spitzkbd);
+		    "Spitzkbd HP", spitzkbd))
+		printk(KERN_WARNING "spitzkbd: Failed to request AK IRQ\n");
 
 	return 0;
 
maintainer
#1 lore raw

Hi Richard,

Quoted 3 lines · Richard Purdie

Fix compile warnings from spitzkbd.c. Registration failure of these IRQs isn't fatal so just warn about it.

Could we also print error codes returned by request_irq()?

Signature · 1 line
Dmitry