diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2008-09-02 14:18:47 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-09-02 14:18:47 -0400 |
commit | bfc2f01fc83f982344f09f491f7c18a6b9a16aa8 (patch) | |
tree | 02dce9d575e1399776a6ff1fcab2103abb993984 /drivers/ide/arm/palm_bk3710.c | |
parent | 96f80219b738f84f90e449385bdede90f2910521 (diff) |
palm_bk3710: improve IDE registration
* fix device tree ... don't forget to set the parent device
* let init/exit code be removed where practical
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
[bart: splitted it from bigger DaVinci patch, s/hw.parent/hw.dev/]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm/palm_bk3710.c')
-rw-r--r-- | drivers/ide/arm/palm_bk3710.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c index 581a7d1cc500..4fd91dcf1dc2 100644 --- a/drivers/ide/arm/palm_bk3710.c +++ b/drivers/ide/arm/palm_bk3710.c | |||
@@ -343,7 +343,7 @@ static struct ide_port_info __devinitdata palm_bk3710_port_info = { | |||
343 | .mwdma_mask = ATA_MWDMA2, | 343 | .mwdma_mask = ATA_MWDMA2, |
344 | }; | 344 | }; |
345 | 345 | ||
346 | static int __devinit palm_bk3710_probe(struct platform_device *pdev) | 346 | static int __init palm_bk3710_probe(struct platform_device *pdev) |
347 | { | 347 | { |
348 | struct clk *clk; | 348 | struct clk *clk; |
349 | struct resource *mem, *irq; | 349 | struct resource *mem, *irq; |
@@ -389,6 +389,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) | |||
389 | hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i; | 389 | hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i; |
390 | hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET; | 390 | hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET; |
391 | hw.irq = irq->start; | 391 | hw.irq = irq->start; |
392 | hw.dev = &pdev->dev; | ||
392 | hw.chipset = ide_palm3710; | 393 | hw.chipset = ide_palm3710; |
393 | 394 | ||
394 | palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 : | 395 | palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 : |
@@ -412,13 +413,11 @@ static struct platform_driver platform_bk_driver = { | |||
412 | .name = "palm_bk3710", | 413 | .name = "palm_bk3710", |
413 | .owner = THIS_MODULE, | 414 | .owner = THIS_MODULE, |
414 | }, | 415 | }, |
415 | .probe = palm_bk3710_probe, | ||
416 | .remove = NULL, | ||
417 | }; | 416 | }; |
418 | 417 | ||
419 | static int __init palm_bk3710_init(void) | 418 | static int __init palm_bk3710_init(void) |
420 | { | 419 | { |
421 | return platform_driver_register(&platform_bk_driver); | 420 | return platform_driver_probe(&platform_bk_driver, palm_bk3710_probe); |
422 | } | 421 | } |
423 | 422 | ||
424 | module_init(palm_bk3710_init); | 423 | module_init(palm_bk3710_init); |