Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c41e43c6 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Brian Norris
Browse files

mtd: dataflash: Replace C99 types with their kernel counterparts 



No functional change intended.

Cc: cphealy@gmail.com
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Cc: linux-kernel@vger.kernel.org
Acked-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Tested-by: default avatarChris Healy <cphealy@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent a9402889

drivers/mtd/devices/mtd_dataflash.c

+20 −20
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 




struct dataflash {

	uint8_t			command[4];

	u8			command[4];

	char			name[24];



	unsigned short		page_offset;	/* offset in flash address */
@@ -153,8 +153,8 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr) 
	struct spi_transfer	x = { };

	struct spi_message	msg;

	unsigned		blocksize = priv->page_size << 3;

	uint8_t			*command;

	uint32_t		rem;

	u8			*command;

	u32			rem;



	pr_debug("%s: erase addr=0x%llx len 0x%llx\n",

	      dev_name(&spi->dev), (long long)instr->addr,
@@ -187,8 +187,8 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr) 
		pageaddr = pageaddr << priv->page_offset;



		command[0] = do_block ? OP_ERASE_BLOCK : OP_ERASE_PAGE;

		command[1] = (uint8_t)(pageaddr >> 16);

		command[2] = (uint8_t)(pageaddr >> 8);

		command[1] = (u8)(pageaddr >> 16);

		command[2] = (u8)(pageaddr >> 8);

		command[3] = 0;



		pr_debug("ERASE %s: (%x) %x %x %x [%i]\n",
@@ -239,7 +239,7 @@ static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len, 
	struct spi_transfer	x[2] = { };

	struct spi_message	msg;

	unsigned int		addr;

	uint8_t			*command;

	u8			*command;

	int			status;



	pr_debug("%s: read 0x%x..0x%x\n", dev_name(&priv->spi->dev),
@@ -271,9 +271,9 @@ static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len, 
	 * fewer "don't care" bytes.  Both buffers stay unchanged.

	 */

	command[0] = OP_READ_CONTINUOUS;

	command[1] = (uint8_t)(addr >> 16);

	command[2] = (uint8_t)(addr >> 8);

	command[3] = (uint8_t)(addr >> 0);

	command[1] = (u8)(addr >> 16);

	command[2] = (u8)(addr >> 8);

	command[3] = (u8)(addr >> 0);

	/* plus 4 "don't care" bytes */



	status = spi_sync(priv->spi, &msg);
@@ -308,7 +308,7 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len, 
	size_t			remaining = len;

	u_char			*writebuf = (u_char *) buf;

	int			status = -EINVAL;

	uint8_t			*command;

	u8			*command;



	pr_debug("%s: write 0x%x..0x%x\n",

		dev_name(&spi->dev), (unsigned)to, (unsigned)(to + len));
@@ -455,11 +455,11 @@ static int dataflash_get_otp_info(struct mtd_info *mtd, size_t len, 
}



static ssize_t otp_read(struct spi_device *spi, unsigned base,

		uint8_t *buf, loff_t off, size_t len)

		u8 *buf, loff_t off, size_t len)

{

	struct spi_message	m;

	size_t			l;

	uint8_t			*scratch;

	u8			*scratch;

	struct spi_transfer	t;

	int			status;
@@ -538,7 +538,7 @@ static int dataflash_write_user_otp(struct mtd_info *mtd, 
{

	struct spi_message	m;

	const size_t		l = 4 + 64;

	uint8_t			*scratch;

	u8			*scratch;

	struct spi_transfer	t;

	struct dataflash	*priv = mtd->priv;

	int			status;
@@ -689,14 +689,14 @@ struct flash_info { 
	/* JEDEC id has a high byte of zero plus three data bytes:

	 * the manufacturer id, then a two byte device id.

	 */

	uint32_t	jedec_id;

	u32		jedec_id;



	/* The size listed here is what works with OP_ERASE_PAGE. */

	unsigned	nr_pages;

	uint16_t	pagesize;

	uint16_t	pageoffset;

	u16		pagesize;

	u16		pageoffset;



	uint16_t	flags;

	u16		flags;

#define SUP_POW2PS	0x0002		/* supports 2^N byte pages */

#define IS_POW2PS	0x0001		/* uses 2^N byte pages */

};
@@ -739,9 +739,9 @@ static struct flash_info dataflash_data[] = { 
static struct flash_info *jedec_probe(struct spi_device *spi)

{

	int			tmp;

	uint8_t			code = OP_READ_ID;

	uint8_t			id[3];

	uint32_t		jedec;

	u8			code = OP_READ_ID;

	u8			id[3];

	u32			jedec;

	struct flash_info	*info;

	int status;