diff options
Diffstat (limited to 'drivers/net/sunqe.c')
-rw-r--r-- | drivers/net/sunqe.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c index a7542d25c845..72b579c8d812 100644 --- a/drivers/net/sunqe.c +++ b/drivers/net/sunqe.c | |||
@@ -695,7 +695,7 @@ static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | |||
695 | strcpy(info->version, "3.0"); | 695 | strcpy(info->version, "3.0"); |
696 | 696 | ||
697 | op = qep->op; | 697 | op = qep->op; |
698 | regs = of_get_property(op->node, "reg", NULL); | 698 | regs = of_get_property(op->dev.of_node, "reg", NULL); |
699 | if (regs) | 699 | if (regs) |
700 | sprintf(info->bus_info, "SBUS:%d", regs->which_io); | 700 | sprintf(info->bus_info, "SBUS:%d", regs->which_io); |
701 | 701 | ||
@@ -799,7 +799,7 @@ static struct sunqec * __devinit get_qec(struct of_device *child) | |||
799 | if (qec_global_reset(qecp->gregs)) | 799 | if (qec_global_reset(qecp->gregs)) |
800 | goto fail; | 800 | goto fail; |
801 | 801 | ||
802 | qecp->qec_bursts = qec_get_burst(op->node); | 802 | qecp->qec_bursts = qec_get_burst(op->dev.of_node); |
803 | 803 | ||
804 | qec_init_once(qecp, op); | 804 | qec_init_once(qecp, op); |
805 | 805 | ||
@@ -857,7 +857,7 @@ static int __devinit qec_ether_init(struct of_device *op) | |||
857 | 857 | ||
858 | res = -ENODEV; | 858 | res = -ENODEV; |
859 | 859 | ||
860 | i = of_getintprop_default(op->node, "channel#", -1); | 860 | i = of_getintprop_default(op->dev.of_node, "channel#", -1); |
861 | if (i == -1) | 861 | if (i == -1) |
862 | goto fail; | 862 | goto fail; |
863 | qe->channel = i; | 863 | qe->channel = i; |
@@ -977,8 +977,11 @@ static const struct of_device_id qec_sbus_match[] = { | |||
977 | MODULE_DEVICE_TABLE(of, qec_sbus_match); | 977 | MODULE_DEVICE_TABLE(of, qec_sbus_match); |
978 | 978 | ||
979 | static struct of_platform_driver qec_sbus_driver = { | 979 | static struct of_platform_driver qec_sbus_driver = { |
980 | .name = "qec", | 980 | .driver = { |
981 | .match_table = qec_sbus_match, | 981 | .name = "qec", |
982 | .owner = THIS_MODULE, | ||
983 | .of_match_table = qec_sbus_match, | ||
984 | }, | ||
982 | .probe = qec_sbus_probe, | 985 | .probe = qec_sbus_probe, |
983 | .remove = __devexit_p(qec_sbus_remove), | 986 | .remove = __devexit_p(qec_sbus_remove), |
984 | }; | 987 | }; |