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

Commit 11966adc authored by Jeff Garzik's avatar Jeff Garzik Committed by Linus Torvalds
Browse files

[PATCH] RTC: build fixes 



Fix obvious build breakage revealed by 'make allyesconfig'
in current -git.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e30fdb1e

drivers/rtc/rtc-ds1307.c

+3 −3
Original line number Diff line number Diff line
@@ -141,9 +141,9 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t) 


	dev_dbg(dev, "%s secs=%d, mins=%d, "

		"hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n",

		"write", dt->tm_sec, dt->tm_min,

		dt->tm_hour, dt->tm_mday,

		dt->tm_mon, dt->tm_year, dt->tm_wday);

		"write", t->tm_sec, t->tm_min,

		t->tm_hour, t->tm_mday,

		t->tm_mon, t->tm_year, t->tm_wday);



	*buf++ = 0;		/* first register addr */

	buf[DS1307_REG_SECS] = BIN2BCD(t->tm_sec);

drivers/rtc/rtc-ds1672.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) 
	}



	dev_dbg(&client->dev,

		"%s: raw read data - counters=%02x,%02x,%02x,%02x\n"

		"%s: raw read data - counters=%02x,%02x,%02x,%02x\n",

		__FUNCTION__, buf[0], buf[1], buf[2], buf[3]);



	time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
@@ -96,7 +96,7 @@ static int ds1672_set_datetime(struct i2c_client *client, struct rtc_time *tm) 
	unsigned long secs;



	dev_dbg(&client->dev,

		"%s: secs=%d, mins=%d, hours=%d, ",

		"%s: secs=%d, mins=%d, hours=%d, "

		"mday=%d, mon=%d, year=%d, wday=%d\n",

		__FUNCTION__,

		tm->tm_sec, tm->tm_min, tm->tm_hour,

drivers/rtc/rtc-rs5c372.c

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm) 
	unsigned char buf[8] = { RS5C372_REG_BASE };



	dev_dbg(&client->dev,

		"%s: secs=%d, mins=%d, hours=%d ",

		"%s: secs=%d, mins=%d, hours=%d "

		"mday=%d, mon=%d, year=%d, wday=%d\n",

		__FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour,

		tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
@@ -126,7 +126,7 @@ static int rs5c372_get_trim(struct i2c_client *client, int *osc, int *trim) 
		return -EIO;

	}



	dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, trim);

	dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, *trim);



	if (osc)

		*osc = (buf & RS5C372_TRIM_XSL) ? 32000 : 32768;