public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [patch 2.6.20-rc3-omap1] musb_hdrc workqueue build fix
@ 2007-01-11  1:17 David Brownell
  2007-01-11 20:20 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: David Brownell @ 2007-01-11  1:17 UTC (permalink / raw)
  To: Linux OMAP

Yet another workqueue-api-changed build fix.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

--- h4.orig/drivers/usb/musb/plat_uds.c	2007-01-10 14:19:43.000000000 -0800
+++ h4/drivers/usb/musb/plat_uds.c	2007-01-10 00:21:44.000000000 -0800
@@ -1561,9 +1561,9 @@ static DEVICE_ATTR(cable, S_IRUGO, musb_
 #endif
 
 /* Only used to provide cable state change events */
-static void musb_irq_work(void *data)
+static void musb_irq_work(struct work_struct *data)
 {
-	struct musb *musb = (struct musb *)data;
+	struct musb *musb = container_of(data, struct musb, irq_work);
 
 	sysfs_notify(&musb->controller->kobj, NULL, "cable");
 }
@@ -1835,7 +1835,7 @@ fail:
 		return status;
 	}
 
-	INIT_WORK(&pThis->irq_work, musb_irq_work, pThis);
+	INIT_WORK(&pThis->irq_work, musb_irq_work);
 
 #ifdef CONFIG_SYSFS
 	status = device_create_file(dev, &dev_attr_mode);

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [patch 2.6.20-rc3-omap1] musb_hdrc workqueue build fix
  2007-01-11  1:17 [patch 2.6.20-rc3-omap1] musb_hdrc workqueue build fix David Brownell
@ 2007-01-11 20:20 ` Tony Lindgren
  0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2007-01-11 20:20 UTC (permalink / raw)
  To: David Brownell; +Cc: Linux OMAP

* David Brownell <david-b@pacbell.net> [070110 17:18]:
> Yet another workqueue-api-changed build fix.
> 
> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
> 
> --- h4.orig/drivers/usb/musb/plat_uds.c	2007-01-10 14:19:43.000000000 -0800
> +++ h4/drivers/usb/musb/plat_uds.c	2007-01-10 00:21:44.000000000 -0800
> @@ -1561,9 +1561,9 @@ static DEVICE_ATTR(cable, S_IRUGO, musb_
>  #endif
>  
>  /* Only used to provide cable state change events */
> -static void musb_irq_work(void *data)
> +static void musb_irq_work(struct work_struct *data)
>  {
> -	struct musb *musb = (struct musb *)data;
> +	struct musb *musb = container_of(data, struct musb, irq_work);
>  
>  	sysfs_notify(&musb->controller->kobj, NULL, "cable");
>  }
> @@ -1835,7 +1835,7 @@ fail:
>  		return status;
>  	}
>  
> -	INIT_WORK(&pThis->irq_work, musb_irq_work, pThis);
> +	INIT_WORK(&pThis->irq_work, musb_irq_work);
>  
>  #ifdef CONFIG_SYSFS
>  	status = device_create_file(dev, &dev_attr_mode);

Pushed.

Tony

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-01-11 20:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-11  1:17 [patch 2.6.20-rc3-omap1] musb_hdrc workqueue build fix David Brownell
2007-01-11 20:20 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox