Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef183f6b authored by David Brownell's avatar David Brownell Committed by Bartlomiej Zolnierkiewicz
Browse files

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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent abb88179

drivers/ide/palm_bk3710.c

+7 −4
Original line number Diff line number Diff line
@@ -346,7 +346,8 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) 
{

	struct clk *clk;

	struct resource *mem, *irq;

	unsigned long base, rate;

	void __iomem *base;

	unsigned long rate;

	int i, rc;

	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);



	/* Configure the Palm Chip controller */

	palm_bk3710_chipinit((void __iomem *)base);

	palm_bk3710_chipinit(base);



	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.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;

		hw.io_ports_array[i] = (unsigned long)

				(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.dev = &pdev->dev;

	hw.chipset = ide_palm3710;