Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: xgene: Silence sparse warnings

drivers/clk/clk-xgene.c:77:43: warning: incorrect type in argument 1 (different address spaces)
drivers/clk/clk-xgene.c:77:43: expected void *csr
drivers/clk/clk-xgene.c:77:43: got void [noderef] <asn:2>*
...
drivers/clk/clk-xgene.c: In function ‘xgene_clk_enable’:
drivers/clk/clk-xgene.c:237:3: warning: format ‘%LX’ expects argument of type ‘long long unsigned int’, but argument 4 has type ‘phys_addr_t’ [-Wformat]
drivers/clk/clk-xgene.c:248:3: warning: format ‘%LX’ expects argument of type ‘long long unsigned int’, but argument 4 has type ‘phys_addr_t’ [-Wformat]

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

+12 -10
+12 -10
drivers/clk/clk-xgene.c
··· 42 42 43 43 static DEFINE_SPINLOCK(clk_lock); 44 44 45 - static inline u32 xgene_clk_read(void *csr) 45 + static inline u32 xgene_clk_read(void __iomem *csr) 46 46 { 47 47 return readl_relaxed(csr); 48 48 } 49 49 50 - static inline void xgene_clk_write(u32 data, void *csr) 50 + static inline void xgene_clk_write(u32 data, void __iomem *csr) 51 51 { 52 52 return writel_relaxed(data, csr); 53 53 } ··· 119 119 return fvco / nout; 120 120 } 121 121 122 - const struct clk_ops xgene_clk_pll_ops = { 122 + static const struct clk_ops xgene_clk_pll_ops = { 123 123 .is_enabled = xgene_clk_pll_is_enabled, 124 124 .recalc_rate = xgene_clk_pll_recalc_rate, 125 125 }; ··· 167 167 { 168 168 const char *clk_name = np->full_name; 169 169 struct clk *clk; 170 - void *reg; 170 + void __iomem *reg; 171 171 172 172 reg = of_iomap(np, 0); 173 173 if (reg == NULL) { ··· 222 222 struct xgene_clk *pclk = to_xgene_clk(hw); 223 223 unsigned long flags = 0; 224 224 u32 data; 225 + phys_addr_t reg; 225 226 226 227 if (pclk->lock) 227 228 spin_lock_irqsave(pclk->lock, flags); 228 229 229 230 if (pclk->param.csr_reg != NULL) { 230 231 pr_debug("%s clock enabled\n", pclk->name); 232 + reg = __pa(pclk->param.csr_reg); 231 233 /* First enable the clock */ 232 234 data = xgene_clk_read(pclk->param.csr_reg + 233 235 pclk->param.reg_clk_offset); 234 236 data |= pclk->param.reg_clk_mask; 235 237 xgene_clk_write(data, pclk->param.csr_reg + 236 238 pclk->param.reg_clk_offset); 237 - pr_debug("%s clock PADDR base 0x%016LX clk offset 0x%08X mask 0x%08X value 0x%08X\n", 238 - pclk->name, __pa(pclk->param.csr_reg), 239 + pr_debug("%s clock PADDR base %pa clk offset 0x%08X mask 0x%08X value 0x%08X\n", 240 + pclk->name, &reg, 239 241 pclk->param.reg_clk_offset, pclk->param.reg_clk_mask, 240 242 data); 241 243 ··· 247 245 data &= ~pclk->param.reg_csr_mask; 248 246 xgene_clk_write(data, pclk->param.csr_reg + 249 247 pclk->param.reg_csr_offset); 250 - pr_debug("%s CSR RESET PADDR base 0x%016LX csr offset 0x%08X mask 0x%08X value 0x%08X\n", 251 - pclk->name, __pa(pclk->param.csr_reg), 248 + pr_debug("%s CSR RESET PADDR base %pa csr offset 0x%08X mask 0x%08X value 0x%08X\n", 249 + pclk->name, &reg, 252 250 pclk->param.reg_csr_offset, pclk->param.reg_csr_mask, 253 251 data); 254 252 } ··· 388 386 return parent_rate / divider; 389 387 } 390 388 391 - const struct clk_ops xgene_clk_ops = { 389 + static const struct clk_ops xgene_clk_ops = { 392 390 .enable = xgene_clk_enable, 393 391 .disable = xgene_clk_disable, 394 392 .is_enabled = xgene_clk_is_enabled, ··· 458 456 parameters.csr_reg = NULL; 459 457 parameters.divider_reg = NULL; 460 458 for (i = 0; i < 2; i++) { 461 - void *map_res; 459 + void __iomem *map_res; 462 460 rc = of_address_to_resource(np, i, &res); 463 461 if (rc != 0) { 464 462 if (i == 0) {