From: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Date: Wed, 7 Aug 2013 16:06:25 +0000 (+0530)
Subject: sf: Remove spi_flash_do_alloc references
X-Git-Tag: v2013.10~38^2~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=30b0ca631895b1bcaa19dfe605f347564e56d1b7;p=oweals%2Fu-boot.git

sf: Remove spi_flash_do_alloc references

Added a support for common probe, hence removed removed
spi_flash_do_alloc reference.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 7ffc7b239e..a5395161e6 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -75,44 +75,6 @@ struct spi_flash {
 	int (*erase)(struct spi_flash *flash, u32 offset, size_t len);
 };
 
-/**
- * spi_flash_do_alloc - Allocate a new spi flash structure
- *
- * The structure is allocated and cleared with default values for
- * read, write and erase, which the caller can modify. The caller must set
- * up size, page_size and sector_size.
- *
- * Use the helper macro spi_flash_alloc() to call this.
- *
- * @offset: Offset of struct spi_slave within slave structure
- * @size: Size of slave structure
- * @spi: SPI slave
- * @name: Name of SPI flash device
- */
-void *spi_flash_do_alloc(int offset, int size, struct spi_slave *spi,
-			 const char *name);
-
-/**
- * spi_flash_alloc - Allocate a new SPI flash structure
- *
- * @_struct: Name of structure to allocate (e.g. struct ramtron_spi_fram). This
- *	structure must contain a member 'struct spi_flash *flash'.
- * @spi: SPI slave
- * @name: Name of SPI flash device
- */
-#define spi_flash_alloc(_struct, spi, name) \
-	spi_flash_do_alloc(offsetof(_struct, flash), sizeof(_struct), \
-				spi, name)
-
-/**
- * spi_flash_alloc_base - Allocate a new SPI flash structure with no private data
- *
- * @spi: SPI slave
- * @name: Name of SPI flash device
- */
-#define spi_flash_alloc_base(spi, name) \
-	spi_flash_do_alloc(0, sizeof(struct spi_flash), spi, name)
-
 struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
 		unsigned int max_hz, unsigned int spi_mode);
 void spi_flash_free(struct spi_flash *flash);