summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/qe.h
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2009-09-16 01:43:52 +0400
committerKumar Gala <galak@kernel.crashing.org>2009-11-11 21:43:13 -0600
commit0c7b87b0857f0e17be982fd840046444a83c3996 (patch)
tree4a03a62678cd4725d5216dbf1fb550bed366908b /arch/powerpc/include/asm/qe.h
parentdc2e673dbcbaebdf84c09956b85c3be3a8b7bd02 (diff)
downloadop-kernel-dev-0c7b87b0857f0e17be982fd840046444a83c3996.zip
op-kernel-dev-0c7b87b0857f0e17be982fd840046444a83c3996.tar.gz
powerpc/qe: Make qe_reset() code path safe for repeated invocation
For MPC8569 CPUs we'll need to reset QE after each suspend, so make qe_reset() code path suitable for repeated invocation, that is: - Don't initialize rheap structures if already initialized; - Don't allocate muram for SDMA if already allocated, just reinitialize registers with previously allocated muram offset; - Remove __init attributes from qe_reset() and cpm_muram_init(); Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/qe.h')
-rw-r--r--arch/powerpc/include/asm/qe.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/qe.h b/arch/powerpc/include/asm/qe.h
index 28fee3b..908f0b7 100644
--- a/arch/powerpc/include/asm/qe.h
+++ b/arch/powerpc/include/asm/qe.h
@@ -87,7 +87,7 @@ extern spinlock_t cmxgcr_lock;
/* Export QE common operations */
#ifdef CONFIG_QUICC_ENGINE
-extern void __init qe_reset(void);
+extern void qe_reset(void);
#else
static inline void qe_reset(void) {}
#endif
OpenPOWER on IntegriCloud