linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] staging: most: add __iomem for io_base and registers
@ 2016-01-02 20:30 Hugo Camboulive
  2016-01-02 20:33 ` Al Viro
  0 siblings, 1 reply; 4+ messages in thread
From: Hugo Camboulive @ 2016-01-02 20:30 UTC (permalink / raw)
  To: gregkh, chaehyun.lim, christian.gromm, andrey.shvetsov,
	sudipm.mukherjee, joe, hugo.camboulive, shraddha.6596
  Cc: devel, linux-kernel

This removes a few Sparse warnings.

Signed-off-by: Hugo Camboulive <hugo.camboulive@gmail.com>
---
 drivers/staging/most/hdm-dim2/dim2_hal.c | 6 +++---
 drivers/staging/most/hdm-dim2/dim2_hal.h | 6 +++---
 drivers/staging/most/hdm-dim2/dim2_hdm.c | 6 +++---
 drivers/staging/most/hdm-dim2/dim2_hdm.h | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.c b/drivers/staging/most/hdm-dim2/dim2_hal.c
index 1722575..ff778d3 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hal.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hal.c
@@ -84,7 +84,7 @@ static inline bool dim_on_error(u8 error_id, const char *error_message)
 struct lld_global_vars_t {
 	bool dim_is_initialized;
 	bool mcm_is_initialized;
-	struct dim2_regs *dim2; /* DIM2 core base address */
+	struct dim2_regs __iomem *dim2; /* DIM2 core base address */
 	u32 dbr_map[DBR_MAP_SIZE];
 };
 
@@ -650,7 +650,7 @@ static bool channel_detach_buffers(struct dim_channel *ch, u16 buffers_number)
 /* -------------------------------------------------------------------------- */
 /* API */
 
-u8 dim_startup(void *dim_base_address, u32 mlb_clock)
+u8 dim_startup(void __iomem *dim_base_address, u32 mlb_clock)
 {
 	g.dim_is_initialized = false;
 
@@ -662,7 +662,7 @@ u8 dim_startup(void *dim_base_address, u32 mlb_clock)
 	if (mlb_clock >= 8)
 		return DIM_INIT_ERR_MLB_CLOCK;
 
-	g.dim2 = dim_base_address;
+	g.dim2 = (struct dim2_regs __iomem *)dim_base_address;
 	g.dbr_map[0] = 0;
 	g.dbr_map[1] = 0;
 
diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.h b/drivers/staging/most/hdm-dim2/dim2_hal.h
index 48cdd9c..8df40c9 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hal.h
+++ b/drivers/staging/most/hdm-dim2/dim2_hal.h
@@ -65,7 +65,7 @@ struct dim_channel {
 	u16 done_sw_buffers_number; /*< Done software buffers number. */
 };
 
-u8 dim_startup(void *dim_base_address, u32 mlb_clock);
+u8 dim_startup(void __iomem *dim_base_address, u32 mlb_clock);
 
 void dim_shutdown(void);
 
@@ -103,9 +103,9 @@ bool dim_enqueue_buffer(struct dim_channel *ch, u32 buffer_addr,
 
 bool dim_detach_buffers(struct dim_channel *ch, u16 buffers_number);
 
-u32 dimcb_io_read(u32 *ptr32);
+u32 dimcb_io_read(u32 __iomem *ptr32);
 
-void dimcb_io_write(u32 *ptr32, u32 value);
+void dimcb_io_write(u32 __iomem *ptr32, u32 value);
 
 void dimcb_on_error(u8 error_id, const char *error_message);
 
diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c b/drivers/staging/most/hdm-dim2/dim2_hdm.c
index 327d738..7d22a6b 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.c
@@ -99,7 +99,7 @@ struct dim2_hdm {
 	struct most_channel_capability capabilities[DMA_CHANNELS];
 	struct most_interface most_iface;
 	char name[16 + sizeof "dim2-"];
-	void *io_base;
+	void __iomem *io_base;
 	unsigned int irq_ahb0;
 	int clk_speed;
 	struct task_struct *netinfo_task;
@@ -138,7 +138,7 @@ bool dim2_sysfs_get_state_cb(void)
  * dimcb_io_read - callback from HAL to read an I/O register
  * @ptr32: register address
  */
-u32 dimcb_io_read(u32 *ptr32)
+u32 dimcb_io_read(u32 __iomem *ptr32)
 {
 	return __raw_readl(ptr32);
 }
@@ -148,7 +148,7 @@ u32 dimcb_io_read(u32 *ptr32)
  * @ptr32: register address
  * @value: value to write
  */
-void dimcb_io_write(u32 *ptr32, u32 value)
+void dimcb_io_write(u32 __iomem *ptr32, u32 value)
 {
 	__raw_writel(value, ptr32);
 }
diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.h b/drivers/staging/most/hdm-dim2/dim2_hdm.h
index 1c94e33..4050e7c 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.h
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.h
@@ -18,7 +18,7 @@ struct device;
 
 /* platform dependent data for dim2 interface */
 struct dim2_platform_data {
-	int (*init)(struct dim2_platform_data *pd, void *io_base,
+	int (*init)(struct dim2_platform_data *pd, void __iomem *io_base,
 		    int clk_speed);
 	void (*destroy)(struct dim2_platform_data *pd);
 	void *priv;
-- 
2.6.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] staging: most: add __iomem for io_base and registers
  2016-01-02 20:30 [PATCH] staging: most: add __iomem for io_base and registers Hugo Camboulive
@ 2016-01-02 20:33 ` Al Viro
  2016-01-02 21:59   ` Hugo Camboulive
  2016-01-02 22:33   ` [PATCH v2] " Hugo Camboulive
  0 siblings, 2 replies; 4+ messages in thread
From: Al Viro @ 2016-01-02 20:33 UTC (permalink / raw)
  To: Hugo Camboulive
  Cc: gregkh, chaehyun.lim, christian.gromm, andrey.shvetsov,
	sudipm.mukherjee, joe, shraddha.6596, devel, linux-kernel

On Sat, Jan 02, 2016 at 08:30:21PM +0000, Hugo Camboulive wrote:
> This removes a few Sparse warnings.

> +	g.dim2 = (struct dim2_regs __iomem *)dim_base_address;

> -u8 dim_startup(void *dim_base_address, u32 mlb_clock);
> +u8 dim_startup(void __iomem *dim_base_address, u32 mlb_clock);

Umm...  Why not have it take struct dim2_regs __iomem * as argument, and
to hell with that cast?

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] staging: most: add __iomem for io_base and registers
  2016-01-02 20:33 ` Al Viro
@ 2016-01-02 21:59   ` Hugo Camboulive
  2016-01-02 22:33   ` [PATCH v2] " Hugo Camboulive
  1 sibling, 0 replies; 4+ messages in thread
From: Hugo Camboulive @ 2016-01-02 21:59 UTC (permalink / raw)
  To: Al Viro
  Cc: gregkh, chaehyun.lim, christian.gromm, andrey.shvetsov,
	sudipm.mukherjee, joe, shraddha.6596, devel, linux-kernel

On Saturday 02 Jan 2016 20:33:23 (+0000), Al Viro wrote:
> On Sat, Jan 02, 2016 at 08:30:21PM +0000, Hugo Camboulive wrote:
> > This removes a few Sparse warnings.
> 
> > +	g.dim2 = (struct dim2_regs __iomem *)dim_base_address;
> 
> > -u8 dim_startup(void *dim_base_address, u32 mlb_clock);
> > +u8 dim_startup(void __iomem *dim_base_address, u32 mlb_clock);
> 
> Umm...  Why not have it take struct dim2_regs __iomem * as argument, and
> to hell with that cast?
Oh, right. I wasn't sure if the original void* was there for a reason. I'll send a v2.

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH v2] staging: most: add __iomem for io_base and registers
  2016-01-02 20:33 ` Al Viro
  2016-01-02 21:59   ` Hugo Camboulive
@ 2016-01-02 22:33   ` Hugo Camboulive
  1 sibling, 0 replies; 4+ messages in thread
From: Hugo Camboulive @ 2016-01-02 22:33 UTC (permalink / raw)
  To: gregkh, chaehyun.lim, christian.gromm, andrey.shvetsov,
	sudipm.mukherjee, joe, hugo.camboulive, shraddha.6596
  Cc: devel, linux-kernel

This removes a few Sparse warnings.

Signed-off-by: Hugo Camboulive <hugo.camboulive@gmail.com>
---
 drivers/staging/most/hdm-dim2/dim2_hal.c | 4 ++--
 drivers/staging/most/hdm-dim2/dim2_hal.h | 7 ++++---
 drivers/staging/most/hdm-dim2/dim2_hdm.c | 6 +++---
 drivers/staging/most/hdm-dim2/dim2_hdm.h | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.c b/drivers/staging/most/hdm-dim2/dim2_hal.c
index 1722575..3c52450 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hal.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hal.c
@@ -84,7 +84,7 @@ static inline bool dim_on_error(u8 error_id, const char *error_message)
 struct lld_global_vars_t {
 	bool dim_is_initialized;
 	bool mcm_is_initialized;
-	struct dim2_regs *dim2; /* DIM2 core base address */
+	struct dim2_regs __iomem *dim2; /* DIM2 core base address */
 	u32 dbr_map[DBR_MAP_SIZE];
 };
 
@@ -650,7 +650,7 @@ static bool channel_detach_buffers(struct dim_channel *ch, u16 buffers_number)
 /* -------------------------------------------------------------------------- */
 /* API */
 
-u8 dim_startup(void *dim_base_address, u32 mlb_clock)
+u8 dim_startup(struct dim2_regs __iomem *dim_base_address, u32 mlb_clock)
 {
 	g.dim_is_initialized = false;
 
diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.h b/drivers/staging/most/hdm-dim2/dim2_hal.h
index 48cdd9c..fc73d4f 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hal.h
+++ b/drivers/staging/most/hdm-dim2/dim2_hal.h
@@ -16,6 +16,7 @@
 #define _DIM2_HAL_H
 
 #include <linux/types.h>
+#include "dim2_reg.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,7 +66,7 @@ struct dim_channel {
 	u16 done_sw_buffers_number; /*< Done software buffers number. */
 };
 
-u8 dim_startup(void *dim_base_address, u32 mlb_clock);
+u8 dim_startup(struct dim2_regs __iomem *dim_base_address, u32 mlb_clock);
 
 void dim_shutdown(void);
 
@@ -103,9 +104,9 @@ bool dim_enqueue_buffer(struct dim_channel *ch, u32 buffer_addr,
 
 bool dim_detach_buffers(struct dim_channel *ch, u16 buffers_number);
 
-u32 dimcb_io_read(u32 *ptr32);
+u32 dimcb_io_read(u32 __iomem *ptr32);
 
-void dimcb_io_write(u32 *ptr32, u32 value);
+void dimcb_io_write(u32 __iomem *ptr32, u32 value);
 
 void dimcb_on_error(u8 error_id, const char *error_message);
 
diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c b/drivers/staging/most/hdm-dim2/dim2_hdm.c
index 327d738..7d22a6b 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.c
@@ -99,7 +99,7 @@ struct dim2_hdm {
 	struct most_channel_capability capabilities[DMA_CHANNELS];
 	struct most_interface most_iface;
 	char name[16 + sizeof "dim2-"];
-	void *io_base;
+	void __iomem *io_base;
 	unsigned int irq_ahb0;
 	int clk_speed;
 	struct task_struct *netinfo_task;
@@ -138,7 +138,7 @@ bool dim2_sysfs_get_state_cb(void)
  * dimcb_io_read - callback from HAL to read an I/O register
  * @ptr32: register address
  */
-u32 dimcb_io_read(u32 *ptr32)
+u32 dimcb_io_read(u32 __iomem *ptr32)
 {
 	return __raw_readl(ptr32);
 }
@@ -148,7 +148,7 @@ u32 dimcb_io_read(u32 *ptr32)
  * @ptr32: register address
  * @value: value to write
  */
-void dimcb_io_write(u32 *ptr32, u32 value)
+void dimcb_io_write(u32 __iomem *ptr32, u32 value)
 {
 	__raw_writel(value, ptr32);
 }
diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.h b/drivers/staging/most/hdm-dim2/dim2_hdm.h
index 1c94e33..4050e7c 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.h
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.h
@@ -18,7 +18,7 @@ struct device;
 
 /* platform dependent data for dim2 interface */
 struct dim2_platform_data {
-	int (*init)(struct dim2_platform_data *pd, void *io_base,
+	int (*init)(struct dim2_platform_data *pd, void __iomem *io_base,
 		    int clk_speed);
 	void (*destroy)(struct dim2_platform_data *pd);
 	void *priv;
-- 
2.6.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-02 21:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-02 20:30 [PATCH] staging: most: add __iomem for io_base and registers Hugo Camboulive
2016-01-02 20:33 ` Al Viro
2016-01-02 21:59   ` Hugo Camboulive
2016-01-02 22:33   ` [PATCH v2] " Hugo Camboulive

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).