projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c70b17b
)
memstick: r592: fix build warnings for !PM_SLEEP
author
Thierry Reding
<
[email protected]
>
Mon, 13 Oct 2014 22:53:59 +0000
(15:53 -0700)
committer
Linus Torvalds
<
[email protected]
>
Tue, 14 Oct 2014 00:18:22 +0000
(
02:18
+0200)
When PM_SLEEP is not enabled, the r592_clear_interrupts() function is
never used. If so, don't build it to prevent a compiler warning.
Signed-off-by: Thierry Reding <
[email protected]
>
Cc: Maxim Levitsky <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/memstick/host/r592.c
patch
|
blob
|
history
diff --git
a/drivers/memstick/host/r592.c
b/drivers/memstick/host/r592.c
index 31727bf285d0de164d00024a5c34fe539403c94d..e2a4f5f415b2be30d0b223d7fac1e423dec411cf 100644
(file)
--- a/
drivers/memstick/host/r592.c
+++ b/
drivers/memstick/host/r592.c
@@
-188,6
+188,7
@@
static void r592_host_reset(struct r592_device *dev)
r592_set_mode(dev, dev->parallel_mode);
}
+#ifdef CONFIG_PM_SLEEP
/* Disable all hardware interrupts */
static void r592_clear_interrupts(struct r592_device *dev)
{
@@
-195,6
+196,7
@@
static void r592_clear_interrupts(struct r592_device *dev)
r592_clear_reg_mask(dev, R592_REG_MSC, IRQ_ALL_ACK_MASK);
r592_clear_reg_mask(dev, R592_REG_MSC, IRQ_ALL_EN_MASK);
}
+#endif
/* Tests if there is an CRC error */
static int r592_test_io_error(struct r592_device *dev)