Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[ARM] 5255/1: Update jornada ssp to remove build errors/warnings

* Adds ssp functions into header so we don't get
"implicit declaration" error at builtime.
* Converts jornada_ssp_start/end functions into voids with
proper declarations (to avoid "prototype..." warning).
* Sorts include files in alphabetical order
* Minor comment changes

Signed-off-by: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Kristoffer Ericson and committed by
Russell King
58005b32 7e8bc3c6

+13 -8
+8 -3
arch/arm/mach-sa1100/include/mach/jornada720.h
··· 1 1 /* 2 2 * arch/arm/mach-sa1100/include/mach/jornada720.h 3 3 * 4 - * This file contains SSP/MCU communication definitions for HP Jornada 710/720/728 4 + * SSP/MCU communication definitions for HP Jornada 710/720/728 5 5 * 6 - * Copyright (C) 2007 Kristoffer Ericson <Kristoffer.Ericson@gmail.com> 7 - * Copyright (C) 2000 John Ankcorn <jca@lcs.mit.edu> 6 + * Copyright 2007,2008 Kristoffer Ericson <Kristoffer.Ericson@gmail.com> 7 + * Copyright 2000 John Ankcorn <jca@lcs.mit.edu> 8 8 * 9 9 * This program is free software; you can redistribute it and/or modify 10 10 * it under the terms of the GNU General Public License version 2 as ··· 25 25 #define PWMOFF 0xDF 26 26 #define TXDUMMY 0x11 27 27 #define ERRORCODE 0x00 28 + 29 + extern void jornada_ssp_start(void); 30 + extern void jornada_ssp_end(void); 31 + extern int jornada_ssp_inout(u8 byte); 32 + extern int jornada_ssp_byte(u8 byte);
+5 -5
arch/arm/mach-sa1100/jornada720_ssp.c
··· 21 21 #include <linux/slab.h> 22 22 23 23 #include <mach/hardware.h> 24 - #include <asm/hardware/ssp.h> 25 24 #include <mach/jornada720.h> 25 + #include <asm/hardware/ssp.h> 26 26 27 27 static DEFINE_SPINLOCK(jornada_ssp_lock); 28 28 static unsigned long jornada_ssp_flags; ··· 109 109 * jornada_ssp_start - enable mcu 110 110 * 111 111 */ 112 - int jornada_ssp_start() 112 + void jornada_ssp_start(void) 113 113 { 114 114 spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags); 115 115 GPCR = GPIO_GPIO25; 116 116 udelay(50); 117 - return 0; 117 + return; 118 118 }; 119 119 EXPORT_SYMBOL(jornada_ssp_start); 120 120 ··· 122 122 * jornada_ssp_end - disable mcu and turn off lock 123 123 * 124 124 */ 125 - int jornada_ssp_end() 125 + void jornada_ssp_end(void) 126 126 { 127 127 GPSR = GPIO_GPIO25; 128 128 spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags); 129 - return 0; 129 + return; 130 130 }; 131 131 EXPORT_SYMBOL(jornada_ssp_end); 132 132