Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fa449bd602c8871da48e6dbadfa0faaf4d33d32e

Authored by David S. Miller
1 parent d297c31fd1
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[OPENPROM]: Use pci_device_to_OF_node(). 

Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 8 additions and 10 deletions Side-by-side Diff

drivers/sbus/char/openprom.c
Diff comments   View file @ fa449bd
... ... @@ -44,7 +44,6 @@
44 44 #include <asm/openpromio.h>
45 45 #ifdef CONFIG_PCI
46 46 #include <linux/pci.h>
47   -#include <asm/pbm.h>
48 47 #endif
49 48  
50 49 MODULE_AUTHOR("Thomas K. Dyas (tdyas@noc.rutgers.edu) and Eddie C. Dost (ecd@skynet.be)");
51 50  
... ... @@ -248,18 +247,17 @@
248 247 if (bufsize >= 2*sizeof(int)) {
249 248 #ifdef CONFIG_PCI
250 249 struct pci_dev *pdev;
251   - struct pcidev_cookie *pcp;
  250 + struct device_node *dp;
  251 +
252 252 pdev = pci_get_bus_and_slot (((int *) op->oprom_array)[0],
253 253 ((int *) op->oprom_array)[1]);
254 254  
255   - pcp = pdev->sysdata;
256   - if (pcp != NULL) {
257   - dp = pcp->prom_node;
258   - data->current_node = dp;
259   - *((int *)op->oprom_array) = dp->node;
260   - op->oprom_size = sizeof(int);
261   - err = copyout(argp, op, bufsize + sizeof(int));
262   - }
  255 + dp = pci_device_to_OF_node(pdev);
  256 + data->current_node = dp;
  257 + *((int *)op->oprom_array) = dp->node;
  258 + op->oprom_size = sizeof(int);
  259 + err = copyout(argp, op, bufsize + sizeof(int));
  260 +
263 261 pci_dev_put(pdev);
264 262 #endif
265 263 }