diff options
| author | hartleys <hartleys@visionengravers.com> | 2010-05-06 20:51:04 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 00:23:17 -0600 |
| commit | 41c4221ca6b9db8ea63d2c2323c0e7a8865eba6e (patch) | |
| tree | 31e12f709964805f9d73cf834297950b9ad09000 /drivers/spi/spi_sh_sci.c | |
| parent | 6e27388f1bd60b55e0b1a83d14233e6c7ad33700 (diff) | |
| download | kernel_samsung_smdk4412-41c4221ca6b9db8ea63d2c2323c0e7a8865eba6e.zip kernel_samsung_smdk4412-41c4221ca6b9db8ea63d2c2323c0e7a8865eba6e.tar.gz kernel_samsung_smdk4412-41c4221ca6b9db8ea63d2c2323c0e7a8865eba6e.tar.bz2 | |
spi: move bitbang txrx utility functions to private header
A number of files in drivers/spi fail checkincludes.pl due to the double
include of <linux/spi/spi_bitbang.h>.
The first include is needed to get the struct spi_bitbang definition and
the spi_bitbang_* function prototypes.
The second include happens after defining EXPAND_BITBANG_TXRX to get the
inlined bitbang_txrx_* utility functions.
The <linux/spi/spi_bitbang.h> header is also included by a number of other
spi drivers, as well as some arch/ code, in order to use struct spi_bitbang
and the associated functions.
To fix the double include, and remove any potential confusion about it, move
the inlined bitbang_txrx_* functions to a new private header in drivers/spi
and also remove the need to define EXPAND_BITBANG_TXRX.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi/spi_sh_sci.c')
| -rw-r--r-- | drivers/spi/spi_sh_sci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi_sh_sci.c b/drivers/spi/spi_sh_sci.c index a65c12f..a511be7 100644 --- a/drivers/spi/spi_sh_sci.c +++ b/drivers/spi/spi_sh_sci.c @@ -78,8 +78,7 @@ static inline u32 getmiso(struct spi_device *dev) #define spidelay(x) ndelay(x) -#define EXPAND_BITBANG_TXRX -#include <linux/spi/spi_bitbang.h> +#include "spi_bitbang_txrx.h" static u32 sh_sci_spi_txrx_mode0(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits) |