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

Commit 3936e4c8 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

at25: fix debug and error messaging 



The patch does the following:
- fixes specifiers and removes explicit casting of the parameters
- joins literals to one line
- increases readability of the parameters

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 13decfb4

drivers/misc/eeprom/at25.c

+7 −13
Original line number Diff line number Diff line
@@ -121,9 +121,8 @@ static int at25_ee_read(void *priv, unsigned int offset, 
	 * this chip is clocked very slowly

	 */

	status = spi_sync(at25->spi, &m);

	dev_dbg(&at25->spi->dev,

		"read %Zd bytes at %d --> %d\n",

		count, offset, (int) status);

	dev_dbg(&at25->spi->dev, "read %zu bytes at %d --> %zd\n",

		count, offset, status);



	mutex_unlock(&at25->lock);

	return status;
@@ -167,8 +166,7 @@ static int at25_ee_write(void *priv, unsigned int off, void *val, size_t count) 
		*cp = AT25_WREN;

		status = spi_write(at25->spi, cp, 1);

		if (status < 0) {

			dev_dbg(&at25->spi->dev, "WREN --> %d\n",

					(int) status);

			dev_dbg(&at25->spi->dev, "WREN --> %d\n", status);

			break;

		}
@@ -196,9 +194,8 @@ static int at25_ee_write(void *priv, unsigned int off, void *val, size_t count) 
		memcpy(cp, buf, segment);

		status = spi_write(at25->spi, bounce,

				segment + at25->addrlen + 1);

		dev_dbg(&at25->spi->dev,

				"write %u bytes at %u --> %d\n",

				segment, offset, (int) status);

		dev_dbg(&at25->spi->dev, "write %u bytes at %u --> %d\n",

			segment, offset, status);

		if (status < 0)

			break;
@@ -225,8 +222,7 @@ static int at25_ee_write(void *priv, unsigned int off, void *val, size_t count) 


		if ((sr < 0) || (sr & AT25_SR_nRDY)) {

			dev_err(&at25->spi->dev,

				"write %d bytes offset %d, "

				"timeout after %u msecs\n",

				"write %u bytes offset %u, timeout after %u msecs\n",

				segment, offset,

				jiffies_to_msecs(jiffies -

					(timeout - EE_TIMEOUT)));
@@ -368,9 +364,7 @@ static int at25_probe(struct spi_device *spi) 
		return PTR_ERR(at25->nvmem);



	dev_info(&spi->dev, "%d %s %s eeprom%s, pagesize %u\n",

		(chip.byte_len < 1024)

			? chip.byte_len

			: (chip.byte_len / 1024),

		(chip.byte_len < 1024) ? chip.byte_len : (chip.byte_len / 1024),

		(chip.byte_len < 1024) ? "Byte" : "KByte",

		at25->chip.name,

		(chip.flags & EE_READONLY) ? " (readonly)" : "",