diff options
author | Thierry Reding <treding@nvidia.com> | 2014-10-13 15:53:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 02:18:22 +0200 |
commit | 5ef9819234e285abe6b616864e7b1b4607d39b58 (patch) | |
tree | eb8385252b6bd78433c2551a101b84f9ddca3b36 /drivers/memstick | |
parent | c70b17b6538ecda81050a0f5a5475137a0ae451f (diff) | |
download | linux-stable-5ef9819234e285abe6b616864e7b1b4607d39b58.tar.gz linux-stable-5ef9819234e285abe6b616864e7b1b4607d39b58.tar.bz2 linux-stable-5ef9819234e285abe6b616864e7b1b4607d39b58.zip |
memstick: r592: fix build warnings for !PM_SLEEP
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 <treding@nvidia.com>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/memstick')
-rw-r--r-- | drivers/memstick/host/r592.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c index 31727bf285d0..e2a4f5f415b2 100644 --- 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) |