From: Pavel Machek Date: Tue, 21 Apr 2015 08:37:45 +0000 (+0200) Subject: spi flash: fix trivial problems X-Git-Tag: v2015.07-rc1~64^2~8 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d15e74f16cc521da0e08060cda2c87307bd4363f;p=u-boot spi flash: fix trivial problems Fix typos and too big #ifdef. Signed-off-by: Pavel Machek Reviewed-by: Marek Vasut Reviewed-by: Jagannadha Sutradharudu Teki --- diff --git a/include/spi_flash.h b/include/spi_flash.h index 218283fc98..4791b94281 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);