UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc: Fix a bunch of sparse warnings in the qe_lib 

Mostly having to do with not marking things __iomem.  And some failure
to use appropriate accessors to read MMIO regs.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Andy Fleming 2008-05-07 13:19:44 -05:00 committed by Kumar Gala
parent 4cd7e1cbd4
commit 7e1cc9c55a
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/sysdev/qe_lib/qe.c
View File

@ -64,7 +64,7 @@ static phys_addr_t qebase = -1;
phys_addr_t get_qe_base(void) phys_addr_t get_qe_base(void)
{ {
struct device_node *qe; struct device_node *qe;
unsigned int size; int size;
const u32 *prop; const u32 *prop;
if (qebase != -1) if (qebase != -1)
@ -158,7 +158,7 @@ static unsigned int brg_clk = 0;
unsigned int qe_get_brg_clk(void) unsigned int qe_get_brg_clk(void)
{ {
struct device_node *qe; struct device_node *qe;
unsigned int size; int size;
const u32 *prop; const u32 *prop;
if (brg_clk) if (brg_clk)
@ -305,7 +305,7 @@ EXPORT_SYMBOL(qe_put_snum);
static int qe_sdma_init(void) static int qe_sdma_init(void)
{ {
struct sdma *sdma = &qe_immr->sdma; struct sdma __iomem *sdma = &qe_immr->sdma;
unsigned long sdma_buf_offset; unsigned long sdma_buf_offset;
if (!sdma) if (!sdma)

6
arch/powerpc/sysdev/qe_lib/ucc.c
View File

@ -88,7 +88,7 @@ int ucc_set_type(unsigned int ucc_num, enum ucc_speed_type speed)
return 0; return 0;
} }
static void get_cmxucr_reg(unsigned int ucc_num, __be32 **cmxucr, static void get_cmxucr_reg(unsigned int ucc_num, __be32 __iomem **cmxucr,
unsigned int *reg_num, unsigned int *shift) unsigned int *reg_num, unsigned int *shift)
{ {
unsigned int cmx = ((ucc_num & 1) << 1) + (ucc_num > 3); unsigned int cmx = ((ucc_num & 1) << 1) + (ucc_num > 3);
@ -100,7 +100,7 @@ static void get_cmxucr_reg(unsigned int ucc_num, __be32 **cmxucr,
int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask) int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)
{ {
__be32 *cmxucr; __be32 __iomem *cmxucr;
unsigned int reg_num; unsigned int reg_num;
unsigned int shift; unsigned int shift;
@ -121,7 +121,7 @@ int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)
int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock, int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock,
enum comm_dir mode) enum comm_dir mode)
{ {
__be32 *cmxucr; __be32 __iomem *cmxucr;
unsigned int reg_num; unsigned int reg_num;
unsigned int shift; unsigned int shift;
u32 clock_bits = 0; u32 clock_bits = 0;

16
arch/powerpc/sysdev/qe_lib/ucc_fast.c
View File

@ -46,7 +46,7 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
printk(KERN_INFO "uccm : addr=0x%p, val=0x%08x\n", printk(KERN_INFO "uccm : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->uccm, in_be32(&uccf->uf_regs->uccm)); &uccf->uf_regs->uccm, in_be32(&uccf->uf_regs->uccm));
printk(KERN_INFO "uccs : addr=0x%p, val=0x%02x\n", printk(KERN_INFO "uccs : addr=0x%p, val=0x%02x\n",
&uccf->uf_regs->uccs, uccf->uf_regs->uccs); &uccf->uf_regs->uccs, in_8(&uccf->uf_regs->uccs));
printk(KERN_INFO "urfb : addr=0x%p, val=0x%08x\n", printk(KERN_INFO "urfb : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->urfb, in_be32(&uccf->uf_regs->urfb)); &uccf->uf_regs->urfb, in_be32(&uccf->uf_regs->urfb));
printk(KERN_INFO "urfs : addr=0x%p, val=0x%04x\n", printk(KERN_INFO "urfs : addr=0x%p, val=0x%04x\n",
@ -68,7 +68,7 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
printk(KERN_INFO "urtry : addr=0x%p, val=0x%08x\n", printk(KERN_INFO "urtry : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->urtry, in_be32(&uccf->uf_regs->urtry)); &uccf->uf_regs->urtry, in_be32(&uccf->uf_regs->urtry));
printk(KERN_INFO "guemr : addr=0x%p, val=0x%02x\n", printk(KERN_INFO "guemr : addr=0x%p, val=0x%02x\n",
&uccf->uf_regs->guemr, uccf->uf_regs->guemr); &uccf->uf_regs->guemr, in_8(&uccf->uf_regs->guemr));
} }
EXPORT_SYMBOL(ucc_fast_dump_regs); EXPORT_SYMBOL(ucc_fast_dump_regs);
@ -96,7 +96,7 @@ EXPORT_SYMBOL(ucc_fast_transmit_on_demand);
void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode) void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode)
{ {
struct ucc_fast *uf_regs; struct ucc_fast __iomem *uf_regs;
u32 gumr; u32 gumr;
uf_regs = uccf->uf_regs; uf_regs = uccf->uf_regs;
@ -117,7 +117,7 @@ EXPORT_SYMBOL(ucc_fast_enable);
void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode) void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode)
{ {
struct ucc_fast *uf_regs; struct ucc_fast __iomem *uf_regs;
u32 gumr; u32 gumr;
uf_regs = uccf->uf_regs; uf_regs = uccf->uf_regs;
@ -139,7 +139,7 @@ EXPORT_SYMBOL(ucc_fast_disable);
int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** uccf_ret) int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** uccf_ret)
{ {
struct ucc_fast_private *uccf; struct ucc_fast_private *uccf;
struct ucc_fast *uf_regs; struct ucc_fast __iomem *uf_regs;
u32 gumr; u32 gumr;
int ret; int ret;
@ -216,10 +216,10 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
uccf->stopped_tx = 0; uccf->stopped_tx = 0;
uccf->stopped_rx = 0; uccf->stopped_rx = 0;
uf_regs = uccf->uf_regs; uf_regs = uccf->uf_regs;
uccf->p_ucce = (u32 *) & (uf_regs->ucce); uccf->p_ucce = &uf_regs->ucce;
uccf->p_uccm = (u32 *) & (uf_regs->uccm); uccf->p_uccm = &uf_regs->uccm;
#ifdef CONFIG_UGETH_TX_ON_DEMAND #ifdef CONFIG_UGETH_TX_ON_DEMAND
uccf->p_utodr = (u16 *) & (uf_regs->utodr); uccf->p_utodr = &uf_regs->utodr;
#endif #endif
#ifdef STATISTICS #ifdef STATISTICS
uccf->tx_frames = 0; uccf->tx_frames = 0;

8
include/asm-powerpc/ucc_fast.h
View File

@ -156,11 +156,11 @@ struct ucc_fast_info {
struct ucc_fast_private { struct ucc_fast_private {
struct ucc_fast_info *uf_info; struct ucc_fast_info *uf_info;
struct ucc_fast *uf_regs; /* a pointer to memory map of UCC regs. */ struct ucc_fast __iomem *uf_regs; /* a pointer to the UCC regs. */
u32 *p_ucce; /* a pointer to the event register in memory. */ u32 __iomem *p_ucce; /* a pointer to the event register in memory. */
u32 *p_uccm; /* a pointer to the mask register in memory. */ u32 __iomem *p_uccm; /* a pointer to the mask register in memory. */
#ifdef CONFIG_UGETH_TX_ON_DEMAND #ifdef CONFIG_UGETH_TX_ON_DEMAND
u16 *p_utodr; /* pointer to the transmit on demand register */ u16 __iomem *p_utodr; /* pointer to the transmit on demand register */
#endif #endif
int enabled_tx; /* Whether channel is enabled for Tx (ENT) */ int enabled_tx; /* Whether channel is enabled for Tx (ENT) */
int enabled_rx; /* Whether channel is enabled for Rx (ENR) */ int enabled_rx; /* Whether channel is enabled for Rx (ENR) */