Title: [9294] trunk/drivers/usb/musb/musb_core.c: musb: avoid ifdefs in common code as upstream wont accept them
- Revision
- 9294
- Author
- vapier
- Date
- 2010-10-23 05:38:26 -0400 (Sat, 23 Oct 2010)
Log Message
musb: avoid ifdefs in common code as upstream wont accept them
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/musb_core.c (9293 => 9294)
--- trunk/drivers/usb/musb/musb_core.c 2010-10-23 09:37:52 UTC (rev 9293)
+++ trunk/drivers/usb/musb/musb_core.c 2010-10-23 09:38:26 UTC (rev 9294)
@@ -2407,10 +2407,7 @@
struct platform_device *pdev = to_platform_device(dev);
unsigned long flags;
struct musb *musb = dev_to_musb(&pdev->dev);
-#ifndef CONFIG_BLACKFIN
- if (!musb->clock)
- return 0;
-#endif
+
spin_lock_irqsave(&musb->lock, flags);
if (is_peripheral_active(musb)) {
@@ -2425,10 +2422,12 @@
musb_save_context(musb);
- if (musb->set_clock)
- musb->set_clock(musb->clock, 0);
- else
- clk_disable(musb->clock);
+ if (musb->clock) {
+ if (musb->set_clock)
+ musb->set_clock(musb->clock, 0);
+ else
+ clk_disable(musb->clock);
+ }
spin_unlock_irqrestore(&musb->lock, flags);
return 0;
}
@@ -2437,15 +2436,14 @@
{
struct platform_device *pdev = to_platform_device(dev);
struct musb *musb = dev_to_musb(&pdev->dev);
-#ifndef CONFIG_BLACKFIN
- if (!musb->clock)
- return 0;
-#endif
- if (musb->set_clock)
- musb->set_clock(musb->clock, 1);
- else
- clk_enable(musb->clock);
+ if (musb->clock) {
+ if (musb->set_clock)
+ musb->set_clock(musb->clock, 1);
+ else
+ clk_enable(musb->clock);
+ }
+
musb_restore_context(musb);
/* for static cmos like DaVinci, register values were preserved
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
