The patch titled
Subject: memstick: r592: fix build warnings for !PM_SLEEP
has been added to the -mm tree. Its filename is
memstick-r592-fix-build-warnings-for-pm_sleep.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/memstick-r592-fix-build-warnings-for-pm_sleep.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/memstick-r592-fix-build-warnings-for-pm_sleep.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Thierry Reding <treding@xxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/memstick/host/r592.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN drivers/memstick/host/r592.c~memstick-r592-fix-build-warnings-for-pm_sleep drivers/memstick/host/r592.c
--- a/drivers/memstick/host/r592.c~memstick-r592-fix-build-warnings-for-pm_sleep
+++ a/drivers/memstick/host/r592.c
@@ -188,6 +188,7 @@ static void r592_host_reset(struct r592_
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_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)
_
Patches currently in -mm which might be from treding@xxxxxxxxxx are
memstick-r592-fix-build-warnings-for-pm_sleep.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
