diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-22 07:57:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-22 07:57:23 -0500 |
| commit | 081abb130944e0c6ef5c7e5743422b7b375526b9 (patch) | |
| tree | 5a360f0b2741fbf719b18e57e2e8e84c504b7234 /include | |
| parent | ca39bd8ce13434160f298c398de3e2fb2aafc923 (diff) | |
| parent | 1f3232d2a10e35f619e48f49d0d8549cf2efcaa8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/err.h | 5 | ||||
| -rw-r--r-- | include/spi.h | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/err.h b/include/linux/err.h index e4d22d508c..22e5756edd 100644 --- a/include/linux/err.h +++ b/include/linux/err.h @@ -36,6 +36,11 @@ static inline long IS_ERR(const void *ptr) return IS_ERR_VALUE((unsigned long)ptr); } +static inline bool IS_ERR_OR_NULL(const void *ptr) +{ + return !ptr || IS_ERR_VALUE((unsigned long)ptr); +} + /** * ERR_CAST - Explicitly cast an error-valued pointer to another pointer type * @ptr: The pointer to cast. diff --git a/include/spi.h b/include/spi.h index 4c179838ee..deb65efdfb 100644 --- a/include/spi.h +++ b/include/spi.h @@ -30,10 +30,6 @@ #define SPI_RX_DUAL BIT(12) /* receive with 2 wires */ #define SPI_RX_QUAD BIT(13) /* receive with 4 wires */ -/* SPI bus connection options - see enum spi_dual_flash */ -#define SPI_CONN_DUAL_SHARED (1 << 0) -#define SPI_CONN_DUAL_SEPARATED (1 << 1) - /* Header byte that marks the start of the message */ #define SPI_PREAMBLE_END_BYTE 0xec @@ -93,7 +89,6 @@ struct dm_spi_slave_platdata { * @max_write_size: If non-zero, the maximum number of bytes which can * be written at once, excluding command bytes. * @memory_map: Address of read-only SPI flash access. - * @option: Varies SPI bus options - separate, shared bus. * @flags: Indication of SPI flags. */ struct spi_slave { @@ -117,7 +112,6 @@ struct spi_slave { #define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END) #define SPI_XFER_MMAP BIT(2) /* Memory Mapped start */ #define SPI_XFER_MMAP_END BIT(3) /* Memory Mapped End */ -#define SPI_XFER_U_PAGE BIT(4) }; /** |