aboutsummaryrefslogtreecommitdiff
path: root/drivers/spi/spi_lm70llp.c
diff options
context:
space:
mode:
authorhartleys <hartleys@visionengravers.com>2010-05-06 20:51:04 +0000
committerGrant Likely <grant.likely@secretlab.ca>2010-05-25 00:23:17 -0600
commit41c4221ca6b9db8ea63d2c2323c0e7a8865eba6e (patch)
tree31e12f709964805f9d73cf834297950b9ad09000 /drivers/spi/spi_lm70llp.c
parent6e27388f1bd60b55e0b1a83d14233e6c7ad33700 (diff)
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_lm70llp.c')
-rw-r--r--drivers/spi/spi_lm70llp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi_lm70llp.c b/drivers/spi/spi_lm70llp.c
index 568c781ad91..86fb7b5993d 100644
--- a/drivers/spi/spi_lm70llp.c
+++ b/drivers/spi/spi_lm70llp.c
@@ -174,8 +174,7 @@ static inline int getmiso(struct spi_device *s)
}
/*--------------------------------------------------------------------*/
-#define EXPAND_BITBANG_TXRX 1
-#include <linux/spi/spi_bitbang.h>
+#include "spi_bitbang_txrx.h"
static void lm70_chipselect(struct spi_device *spi, int value)
{