diff options
Diffstat (limited to 'arch/sparc/kernel/central.c')
-rw-r--r-- | arch/sparc/kernel/central.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c index 415c86d5a8da..434335f65823 100644 --- a/arch/sparc/kernel/central.c +++ b/arch/sparc/kernel/central.c | |||
@@ -149,10 +149,11 @@ static struct of_device_id __initdata clock_board_match[] = { | |||
149 | }; | 149 | }; |
150 | 150 | ||
151 | static struct of_platform_driver clock_board_driver = { | 151 | static struct of_platform_driver clock_board_driver = { |
152 | .match_table = clock_board_match, | ||
153 | .probe = clock_board_probe, | 152 | .probe = clock_board_probe, |
154 | .driver = { | 153 | .driver = { |
155 | .name = "clock_board", | 154 | .name = "clock_board", |
155 | .owner = THIS_MODULE, | ||
156 | .of_match_table = clock_board_match, | ||
156 | }, | 157 | }, |
157 | }; | 158 | }; |
158 | 159 | ||
@@ -168,7 +169,7 @@ static int __devinit fhc_probe(struct of_device *op, | |||
168 | goto out; | 169 | goto out; |
169 | } | 170 | } |
170 | 171 | ||
171 | if (!strcmp(op->node->parent->name, "central")) | 172 | if (!strcmp(op->dev.of_node->parent->name, "central")) |
172 | p->central = true; | 173 | p->central = true; |
173 | 174 | ||
174 | p->pregs = of_ioremap(&op->resource[0], 0, | 175 | p->pregs = of_ioremap(&op->resource[0], 0, |
@@ -183,7 +184,7 @@ static int __devinit fhc_probe(struct of_device *op, | |||
183 | reg = upa_readl(p->pregs + FHC_PREGS_BSR); | 184 | reg = upa_readl(p->pregs + FHC_PREGS_BSR); |
184 | p->board_num = ((reg >> 16) & 1) | ((reg >> 12) & 0x0e); | 185 | p->board_num = ((reg >> 16) & 1) | ((reg >> 12) & 0x0e); |
185 | } else { | 186 | } else { |
186 | p->board_num = of_getintprop_default(op->node, "board#", -1); | 187 | p->board_num = of_getintprop_default(op->dev.of_node, "board#", -1); |
187 | if (p->board_num == -1) { | 188 | if (p->board_num == -1) { |
188 | printk(KERN_ERR "fhc: No board# property\n"); | 189 | printk(KERN_ERR "fhc: No board# property\n"); |
189 | goto out_unmap_pregs; | 190 | goto out_unmap_pregs; |
@@ -254,10 +255,11 @@ static struct of_device_id __initdata fhc_match[] = { | |||
254 | }; | 255 | }; |
255 | 256 | ||
256 | static struct of_platform_driver fhc_driver = { | 257 | static struct of_platform_driver fhc_driver = { |
257 | .match_table = fhc_match, | ||
258 | .probe = fhc_probe, | 258 | .probe = fhc_probe, |
259 | .driver = { | 259 | .driver = { |
260 | .name = "fhc", | 260 | .name = "fhc", |
261 | .owner = THIS_MODULE, | ||
262 | .of_match_table = fhc_match, | ||
261 | }, | 263 | }, |
262 | }; | 264 | }; |
263 | 265 | ||