Skip to content

Commit

Permalink
[ARM] integrator: fix build warnings and errors
Browse files Browse the repository at this point in the history
Fix resource_size_t warning in impd1.c, and printascii() build
errors in pci_v3.c

Signed-off-by: Russell King <[email protected]>
  • Loading branch information
Russell King authored and Russell King committed May 23, 2008
1 parent cfb41bf commit 7c28472
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion arch/arm/mach-integrator/impd1.c
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,8 @@ static int impd1_probe(struct lm_device *dev)

lm_set_drvdata(dev, impd1);

printk("IM-PD1 found at 0x%08lx\n", dev->resource.start);
printk("IM-PD1 found at 0x%08lx\n",
(unsigned long)dev->resource.start);

for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) {
impd1->vcos[i].owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-integrator/pci_v3.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
addr, fsr, pc, instr, __raw_readl(SC_LBFADDR), __raw_readl(SC_LBFCODE) & 255,
v3_readb(V3_LB_ISTAT));
printk(KERN_DEBUG "%s", buf);
printascii(buf);
#endif

v3_writeb(V3_LB_ISTAT, 0);
Expand Down Expand Up @@ -447,6 +446,7 @@ static irqreturn_t v3_irq(int dummy, void *devid)
unsigned long pc = instruction_pointer(regs);
unsigned long instr = *(unsigned long *)pc;
char buf[128];
extern void printascii(const char *);

sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x "
"ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr,
Expand Down

0 comments on commit 7c28472

Please sign in to comment.