| 1 | --- a/drivers/ata/pata_rbppc_cf.c |
| 2 | +++ b/drivers/ata/pata_rbppc_cf.c |
| 3 | @@ -522,7 +522,7 @@ static int rbppc_cf_init_info(struct pla |
| 4 | unsigned ccb_freq_hz; |
| 5 | unsigned lb_div; |
| 6 | |
| 7 | - u32ptr = of_get_property(pdev->node, "lbc_extra_divider", NULL); |
| 8 | + u32ptr = of_get_property(pdev->dev.of_node, "lbc_extra_divider", NULL); |
| 9 | if (u32ptr && *u32ptr) { |
| 10 | lbc_extra_divider = *u32ptr; |
| 11 | #if DEBUG_UPM |
| 12 | @@ -568,7 +568,7 @@ static int rbppc_cf_init_info(struct pla |
| 13 | printk(KERN_INFO "rbppc_cf_init_info: Using Local-Bus clock %u kHz %u ps\n", |
| 14 | lbc_clk_khz, info->clk_time_ps); |
| 15 | |
| 16 | - u32ptr = of_get_property(pdev->node, "lb-timings", NULL); |
| 17 | + u32ptr = of_get_property(pdev->dev.of_node, "lb-timings", NULL); |
| 18 | if (u32ptr) { |
| 19 | memcpy(info->lb_timings, u32ptr, LBT_SIZE * sizeof(*u32ptr)); |
| 20 | #if DEBUG_UPM |
| 21 | @@ -608,13 +608,13 @@ static int rbppc_cf_probe(struct platfor |
| 22 | rbinfo = info; |
| 23 | } |
| 24 | |
| 25 | - u32ptr = of_get_property(pdev->node, "interrupt-at-level", NULL); |
| 26 | + u32ptr = of_get_property(pdev->dev.of_node, "interrupt-at-level", NULL); |
| 27 | if (u32ptr) { |
| 28 | irq_level = *u32ptr; |
| 29 | printk(KERN_INFO "rbppc_cf_probe: IRQ level %u\n", irq_level); |
| 30 | } |
| 31 | |
| 32 | - if (of_address_to_resource(pdev->node, 0, &res)) { |
| 33 | + if (of_address_to_resource(pdev->dev.of_node, 0, &res)) { |
| 34 | printk(KERN_ERR "rbppc_cf_probe: No reg property found\n"); |
| 35 | goto err_info; |
| 36 | } |
| 37 | @@ -641,7 +641,7 @@ static int rbppc_cf_probe(struct platfor |
| 38 | |
| 39 | err = ata_host_activate( |
| 40 | host, |
| 41 | - irq_of_parse_and_map(pdev->node, 0), ata_sff_interrupt, |
| 42 | + irq_of_parse_and_map(pdev->dev.of_node, 0), ata_sff_interrupt, |
| 43 | irq_level ? IRQF_TRIGGER_HIGH : IRQF_TRIGGER_LOW, |
| 44 | &rbppc_cf_sht); |
| 45 | if (!err) return 0; |
| 46 | @@ -672,13 +672,12 @@ static struct of_device_id rbppc_cf_ids[ |
| 47 | }; |
| 48 | |
| 49 | static struct of_platform_driver rbppc_cf_driver = { |
| 50 | - .name = "cf", |
| 51 | .probe = rbppc_cf_probe, |
| 52 | .remove = rbppc_cf_remove, |
| 53 | - .match_table = rbppc_cf_ids, |
| 54 | .driver = { |
| 55 | .name = "rbppc-cf", |
| 56 | .owner = THIS_MODULE, |
| 57 | + .of_match_table = rbppc_cf_ids, |
| 58 | }, |
| 59 | }; |
| 60 | |
| 61 | |
