[PATCH 1/2] regmap: Use int rather than size_t for lengths when logging blocks

[PATCH 1/2] regmap: Use int rather than size_t for lengths when logging blocks

[Mark Brown]

x86_64 warns as size_t is not an int.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/trace/events/regmap.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h
index 1c76f40..e35e37c 100644
--- a/include/trace/events/regmap.h
+++ b/include/trace/events/regmap.h
@@ -57,14 +57,14 @@ DEFINE_EVENT(regmap_reg, regmap_reg_read,
 
 DECLARE_EVENT_CLASS(regmap_block,
 
-	TP_PROTO(struct device *dev, unsigned int reg, size_t count),
+	TP_PROTO(struct device *dev, unsigned int reg, int count),
 
 	TP_ARGS(dev, reg, count),
 
 	TP_STRUCT__entry(
 		__string(	name,		dev_name(dev)	)
 		__field(	unsigned int,	reg		)
-		__field(	size_t,		count		)
+		__field(	int,		count		)
 	),
 
 	TP_fast_assign(
@@ -75,33 +75,33 @@ DECLARE_EVENT_CLASS(regmap_block,
 
 	TP_printk("%s reg=%x count=%d", __get_str(name),
 		  (unsigned int)__entry->reg,
-		  (size_t)__entry->count)
+		  (int)__entry->count)
 );
 
 DEFINE_EVENT(regmap_block, regmap_hw_read_start,
 
-	TP_PROTO(struct device *dev, unsigned int reg, size_t count),
+	TP_PROTO(struct device *dev, unsigned int reg, int count),
 
 	TP_ARGS(dev, reg, count)
 );
 
 DEFINE_EVENT(regmap_block, regmap_hw_read_done,
 
-	TP_PROTO(struct device *dev, unsigned int reg, size_t count),
+	TP_PROTO(struct device *dev, unsigned int reg, int count),
 
 	TP_ARGS(dev, reg, count)
 );
 
 DEFINE_EVENT(regmap_block, regmap_hw_write_start,
 
-	TP_PROTO(struct device *dev, unsigned int reg, size_t count),
+	TP_PROTO(struct device *dev, unsigned int reg, int count),
 
 	TP_ARGS(dev, reg, count)
 );
 
 DEFINE_EVENT(regmap_block, regmap_hw_write_done,
 
-	TP_PROTO(struct device *dev, unsigned int reg, size_t count),
+	TP_PROTO(struct device *dev, unsigned int reg, int count),
 
 	TP_ARGS(dev, reg, count)
 );
-- 
1.7.5.4

[PATCH 2/2] regmap: Fix type of field width specifiers for x86_64

[Mark Brown]

x86_64 size_t is not an int but the printf format specifier for size_t
should be an int.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/base/regmap/regmap-debugfs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index d1bd680..068deae 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -36,7 +36,7 @@ static int regmap_open_file(struct inode *inode, struct file *file)
 static ssize_t regmap_map_read_file(struct file *file, char __user *user_buf,
 				    size_t count, loff_t *ppos)
 {
-	size_t reg_len, val_len, tot_len;
+	int reg_len, val_len, tot_len;
 	size_t buf_pos = 0;
 	loff_t p = 0;
 	ssize_t ret;
-- 
1.7.5.4

Re: [PATCH 1/2] regmap: Use int rather than size_t for lengths when logging blocks

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

Hi Mark,

On Tue,  9 Aug 2011 17:00:04 +0900 Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:
>
> x86_64 warns as size_t is not an int.
> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Stephen Rothwell <sfr@canb.auug.org.au>

Reported-by?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: [PATCH 1/2] regmap: Use int rather than size_t for lengths when logging blocks

[Mark Brown]

On Wed, Aug 10, 2011 at 01:08:47AM +1000, Stephen Rothwell wrote:
> On Tue,  9 Aug 2011 17:00:04 +0900 Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:

> > x86_64 warns as size_t is not an int.

> > Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > Stephen Rothwell <sfr@canb.auug.org.au>

> Reported-by?

Uh, yeah.  That.  Oops.