Skip to contentSkip to conversation

Make omap-ir build with workqueue changes.

PATCH In review Andrzej Zaborowski 2 participants 2 messages Jan 4, 2007 – Jan 9, 2007 Network drivers

lore
Share & tools
lore

Andrzej Zaborowski

author
#0 lore raw

PATCH 1/1 Make omap-ir build with workqueue changes.

Signed-off-by Andrzej Zaborowski <[email protected]>
---
 drivers/net/irda/omap-ir.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/irda/omap-ir.c +2 -1
index 562c876..85658dc 100644
@@ -54,6 +54,7 @@ #include <linux/ioport.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
+#include <linux/workqueue.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irmod.h>

@@ -849,7 +850,7 @@ static int omap_irda_probe(struct platfo
 
 	/* Any better way to avoid this? No. */
 	if (machine_is_omap_h3() || machine_is_omap_h4())
-		INIT_WORK(&omap_ir->pdata->gpio_expa, NULL, NULL);
+		INIT_DELAYED_WORK(&omap_ir->pdata->gpio_expa, NULL);
 
 	err = register_netdev(dev);
 	if (!err)
Signature · 1 line
1.4.3.2
#1 lore raw
Quoted 19 lines · Andrzej Zaborowski
Signed-off-by Andrzej Zaborowski <[email protected]>
---
 drivers/net/irda/omap-ir.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/irda/omap-ir.c +1 -0
index 562c876..85658dc 100644
@@ -54,6 +54,7 @@ #include <linux/ioport.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
+#include <linux/workqueue.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irmod.h>

drivers/net/irda/omap-ir.c static int omap_irda_probe(struct platfo · line 856

Quoted 8 lines
drivers/net/irda/omap-ir.c +1 -1
@@ -849,7 +850,7 @@ static int omap_irda_probe(struct platfo
 
 	/* Any better way to avoid this? No. */
 	if (machine_is_omap_h3() || machine_is_omap_h4())
-		INIT_WORK(&omap_ir->pdata->gpio_expa, NULL, NULL);
+		INIT_DELAYED_WORK(&omap_ir->pdata->gpio_expa, NULL);
 
 	err = register_netdev(dev);
 	if (!err)

Pushing today.

Tony