public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] spi flash: fix trivial problems
@ 2015-04-21  8:37 Pavel Machek
  2015-04-21  8:45 ` Marek Vasut
  0 siblings, 1 reply; 3+ messages in thread
From: Pavel Machek @ 2015-04-21  8:37 UTC (permalink / raw)
  To: u-boot


Fix typos and too big #ifdef.
    
Signed-off-by: Pavel Machek <pavel@denx.de>

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 5913b39..5e94e41 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -62,11 +62,9 @@ struct spi_slave;
  * return 0 - Success, 1 - Failure
  */
 struct spi_flash {
-#ifdef CONFIG_DM_SPI_FLASH
 	struct spi_slave *spi;
+#ifdef CONFIG_DM_SPI_FLASH
 	struct udevice *dev;
-#else
-	struct spi_slave *spi;
 #endif
 	const char *name;
 	u8 dual_flash;
@@ -91,13 +89,13 @@ struct spi_flash {
 #ifndef CONFIG_DM_SPI_FLASH
 	/*
 	 * These are not strictly needed for driver model, but keep them here
-	 * whilt the transition is in progress.
+	 * while the transition is in progress.
 	 *
 	 * Normally each driver would provide its own operations, but for
 	 * SPI flash most chips use the same algorithms. One approach is
 	 * to create a 'common' SPI flash device which knows how to talk
 	 * to most devices, and then allow other drivers to be used instead
-	 * if requird, perhaps with a way of scanning through the list to
+	 * if required, perhaps with a way of scanning through the list to
 	 * find the driver that matches the device.
 	 */
 	int (*read)(struct spi_flash *flash, u32 offset, size_t len, void *buf);

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] spi flash: fix trivial problems
  2015-04-21  8:37 [U-Boot] [PATCH] spi flash: fix trivial problems Pavel Machek
@ 2015-04-21  8:45 ` Marek Vasut
  2015-04-21 11:06   ` Jagan Teki
  0 siblings, 1 reply; 3+ messages in thread
From: Marek Vasut @ 2015-04-21  8:45 UTC (permalink / raw)
  To: u-boot

On Tuesday, April 21, 2015 at 10:37:45 AM, Pavel Machek wrote:
> Fix typos and too big #ifdef.
> 
> Signed-off-by: Pavel Machek <pavel@denx.de>

Reviewed-by: Marek Vasut <marex@denx.de>

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] spi flash: fix trivial problems
  2015-04-21  8:45 ` Marek Vasut
@ 2015-04-21 11:06   ` Jagan Teki
  0 siblings, 0 replies; 3+ messages in thread
From: Jagan Teki @ 2015-04-21 11:06 UTC (permalink / raw)
  To: u-boot

On 21 April 2015 at 14:15, Marek Vasut <marex@denx.de> wrote:
> On Tuesday, April 21, 2015 at 10:37:45 AM, Pavel Machek wrote:
>> Fix typos and too big #ifdef.
>>
>> Signed-off-by: Pavel Machek <pavel@denx.de>
>
> Reviewed-by: Marek Vasut <marex@denx.de>

Applied to u-boot-spi/master

thanks!
-- 
Jagan.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-04-21 11:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-21  8:37 [U-Boot] [PATCH] spi flash: fix trivial problems Pavel Machek
2015-04-21  8:45 ` Marek Vasut
2015-04-21 11:06   ` Jagan Teki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox