forked from Minki/linux
drivers/ide/palm_bk3710.c buildfix
CC drivers/ide/palm_bk3710.o drivers/ide/palm_bk3710.c: In function 'palm_bk3710_probe': drivers/ide/palm_bk3710.c:382: warning: assignment makes integer from pointer without a cast Someone should fix hw_regs_t to neither be a typedef, nor use "unsigned long" where it should use "void __iomem *". Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Kevin Hilman <khilman@deeprootsystems.com> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
abb8817967
commit
ef183f6b59
@ -346,7 +346,8 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
|
|||||||
{
|
{
|
||||||
struct clk *clk;
|
struct clk *clk;
|
||||||
struct resource *mem, *irq;
|
struct resource *mem, *irq;
|
||||||
unsigned long base, rate;
|
void __iomem *base;
|
||||||
|
unsigned long rate;
|
||||||
int i, rc;
|
int i, rc;
|
||||||
hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
|
hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
|
||||||
|
|
||||||
@ -382,11 +383,13 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
|
|||||||
base = IO_ADDRESS(mem->start);
|
base = IO_ADDRESS(mem->start);
|
||||||
|
|
||||||
/* Configure the Palm Chip controller */
|
/* Configure the Palm Chip controller */
|
||||||
palm_bk3710_chipinit((void __iomem *)base);
|
palm_bk3710_chipinit(base);
|
||||||
|
|
||||||
for (i = 0; i < IDE_NR_PORTS - 2; i++)
|
for (i = 0; i < IDE_NR_PORTS - 2; i++)
|
||||||
hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i;
|
hw.io_ports_array[i] = (unsigned long)
|
||||||
hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;
|
(base + IDE_PALM_ATA_PRI_REG_OFFSET + i);
|
||||||
|
hw.io_ports.ctl_addr = (unsigned long)
|
||||||
|
(base + IDE_PALM_ATA_PRI_CTL_OFFSET);
|
||||||
hw.irq = irq->start;
|
hw.irq = irq->start;
|
||||||
hw.dev = &pdev->dev;
|
hw.dev = &pdev->dev;
|
||||||
hw.chipset = ide_palm3710;
|
hw.chipset = ide_palm3710;
|
||||||
|
Loading…
Reference in New Issue
Block a user