diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 15:29:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 15:29:01 -0700 |
| commit | fc8cc67787baf9a4cb00d3a1e8d1fe8c878f538a (patch) | |
| tree | d1b2cc23c1b3cc9e73ea817ab0a7aa8d3391f320 /drivers/ide/ide_platform.c | |
| parent | b14662cae0f765355d43357180f4c34916610269 (diff) | |
| parent | 64110c16e012547d5c9ab71f8afd3bab025f1103 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE changes from David Miller:
"Mostly cleanups, and changes part of tree-wide adjustments, this code
is in deep freeze so that's pretty much what we expect these days"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: sgiioc4: Staticize ioc4_ide_attach_one()
ide: palm_bk3710: add missing __iomem annotation
ide: use dev_get_platdata()
ide-disk_proc: use macro to replace magic number
ide: replace strict_strtol() with kstrtol()
Diffstat (limited to 'drivers/ide/ide_platform.c')
| -rw-r--r-- | drivers/ide/ide_platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c index ba4bfbead24..a8b4b6af80e 100644 --- a/drivers/ide/ide_platform.c +++ b/drivers/ide/ide_platform.c @@ -56,7 +56,7 @@ static int plat_ide_probe(struct platform_device *pdev) struct ide_hw hw, *hws[] = { &hw }; struct ide_port_info d = platform_ide_port_info; - pdata = pdev->dev.platform_data; + pdata = dev_get_platdata(&pdev->dev); /* get a pointer to the register memory */ res_base = platform_get_resource(pdev, IORESOURCE_IO, 0); |