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

Commit 01a4ca16 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds
Browse files

drivers/rtc: dump small buffers via %*ph 



Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d7d48f62

drivers/rtc/rtc-ds1305.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -635,9 +635,7 @@ static int ds1305_probe(struct spi_device *spi) 
		goto fail0;

		goto fail0;

	}

	}





	dev_dbg(&spi->dev, "ctrl %s: %02x %02x %02x\n",

	dev_dbg(&spi->dev, "ctrl %s: %3ph\n", "read", ds1305->ctrl);

			"read", ds1305->ctrl[0],

			ds1305->ctrl[1], ds1305->ctrl[2]);





	/* Sanity check register values ... partially compensating for the

	/* Sanity check register values ... partially compensating for the

	 * fact that SPI has no device handshake.  A pullup on MISO would

	 * fact that SPI has no device handshake.  A pullup on MISO would
@@ -723,9 +721,7 @@ static int ds1305_probe(struct spi_device *spi) 
			goto fail0;

			goto fail0;

		}

		}





		dev_dbg(&spi->dev, "ctrl %s: %02x %02x %02x\n",

		dev_dbg(&spi->dev, "ctrl %s: %3ph\n", "write", ds1305->ctrl);

				"write", ds1305->ctrl[0],

				ds1305->ctrl[1], ds1305->ctrl[2]);

	}

	}





	/* see if non-Linux software set up AM/PM mode */

	/* see if non-Linux software set up AM/PM mode */

drivers/rtc/rtc-ds1307.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -322,12 +322,7 @@ static int ds1307_get_time(struct device *dev, struct rtc_time *t) 
		return -EIO;

		return -EIO;

	}

	}





	dev_dbg(dev, "%s: %02x %02x %02x %02x %02x %02x %02x\n",

	dev_dbg(dev, "%s: %7ph\n", "read", ds1307->regs);

			"read",

			ds1307->regs[0], ds1307->regs[1],

			ds1307->regs[2], ds1307->regs[3],

			ds1307->regs[4], ds1307->regs[5],

			ds1307->regs[6]);





	t->tm_sec = bcd2bin(ds1307->regs[DS1307_REG_SECS] & 0x7f);

	t->tm_sec = bcd2bin(ds1307->regs[DS1307_REG_SECS] & 0x7f);

	t->tm_min = bcd2bin(ds1307->regs[DS1307_REG_MIN] & 0x7f);

	t->tm_min = bcd2bin(ds1307->regs[DS1307_REG_MIN] & 0x7f);
@@ -398,9 +393,7 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t) 
		break;

		break;

	}

	}





	dev_dbg(dev, "%s: %02x %02x %02x %02x %02x %02x %02x\n",

	dev_dbg(dev, "%s: %7ph\n", "write", buf);

		"write", buf[0], buf[1], buf[2], buf[3],

		buf[4], buf[5], buf[6]);





	result = ds1307->write_block_data(ds1307->client,

	result = ds1307->write_block_data(ds1307->client,

		ds1307->offset, 7, buf);

		ds1307->offset, 7, buf);

drivers/rtc/rtc-fm3130.c

+4 −29
Original line number Original line Diff line number Diff line
@@ -116,17 +116,7 @@ static int fm3130_get_time(struct device *dev, struct rtc_time *t) 




	fm3130_rtc_mode(dev, FM3130_MODE_NORMAL);

	fm3130_rtc_mode(dev, FM3130_MODE_NORMAL);





	dev_dbg(dev, "%s: %02x %02x %02x %02x %02x %02x %02x %02x"

	dev_dbg(dev, "%s: %15ph\n", "read", fm3130->regs);

			"%02x %02x %02x %02x %02x %02x %02x\n",

			"read",

			fm3130->regs[0], fm3130->regs[1],

			fm3130->regs[2], fm3130->regs[3],

			fm3130->regs[4], fm3130->regs[5],

			fm3130->regs[6], fm3130->regs[7],

			fm3130->regs[8], fm3130->regs[9],

			fm3130->regs[0xa], fm3130->regs[0xb],

			fm3130->regs[0xc], fm3130->regs[0xd],

			fm3130->regs[0xe]);





	t->tm_sec = bcd2bin(fm3130->regs[FM3130_RTC_SECONDS] & 0x7f);

	t->tm_sec = bcd2bin(fm3130->regs[FM3130_RTC_SECONDS] & 0x7f);

	t->tm_min = bcd2bin(fm3130->regs[FM3130_RTC_MINUTES] & 0x7f);

	t->tm_min = bcd2bin(fm3130->regs[FM3130_RTC_MINUTES] & 0x7f);
@@ -175,12 +165,7 @@ static int fm3130_set_time(struct device *dev, struct rtc_time *t) 
	tmp = t->tm_year - 100;

	tmp = t->tm_year - 100;

	buf[FM3130_RTC_YEARS] = bin2bcd(tmp);

	buf[FM3130_RTC_YEARS] = bin2bcd(tmp);





	dev_dbg(dev, "%s: %02x %02x %02x %02x %02x %02x %02x"

	dev_dbg(dev, "%s: %15ph\n", "write", buf);

		"%02x %02x %02x %02x %02x %02x %02x %02x\n",

		"write", buf[0], buf[1], buf[2], buf[3],

		buf[4], buf[5], buf[6], buf[7],

		buf[8], buf[9], buf[0xa], buf[0xb],

		buf[0xc], buf[0xd], buf[0xe]);





	fm3130_rtc_mode(dev, FM3130_MODE_WRITE);

	fm3130_rtc_mode(dev, FM3130_MODE_WRITE);
@@ -517,18 +502,8 @@ static int fm3130_probe(struct i2c_client *client, 
bad_clock:

bad_clock:





	if (!fm3130->data_valid || !fm3130->alarm_valid)

	if (!fm3130->data_valid || !fm3130->alarm_valid)

		dev_dbg(&client->dev,

		dev_dbg(&client->dev, "%s: %15ph\n", "bogus registers",

				"%s: %02x %02x %02x %02x %02x %02x %02x %02x"

			fm3130->regs);

				"%02x %02x %02x %02x %02x %02x %02x\n",

			"bogus registers",

			fm3130->regs[0], fm3130->regs[1],

			fm3130->regs[2], fm3130->regs[3],

			fm3130->regs[4], fm3130->regs[5],

			fm3130->regs[6], fm3130->regs[7],

			fm3130->regs[8], fm3130->regs[9],

			fm3130->regs[0xa], fm3130->regs[0xb],

			fm3130->regs[0xc], fm3130->regs[0xd],

			fm3130->regs[0xe]);





	/* We won't bail out here because we just got invalid data.

	/* We won't bail out here because we just got invalid data.

	   Time setting from u-boot doesn't work anyway */

	   Time setting from u-boot doesn't work anyway */