[QLA2XXX]: Fix build on sparc.

We now use pci_device_to_OF_node() to get properties
and of_get_property() returns const pointers.

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

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 3e296ab845b653a454efc4f05a70f444eed4a67d..089fc7940d8bf157c34d5cac9b51916e6c926a8f 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -13,7 +13,6 @@
 
 #ifdef CONFIG_SPARC
 #include <asm/prom.h>
-#include <asm/pbm.h>
 #endif
 
 /* XXX(hch): this is ugly, but we don't want to pull in exioctl.h */
@@ -1400,9 +1399,8 @@ static void qla2xxx_nvram_wwn_from_ofw(scsi_qla_host_t *ha, nvram_t *nv)
 {
 #ifdef CONFIG_SPARC
        struct pci_dev *pdev = ha->pdev;
-       struct pcidev_cookie *pcp = pdev->sysdata;
-       struct device_node *dp = pcp->prom_node;
-       u8 *val;
+       struct device_node *dp = pci_device_to_OF_node(pdev);
+       const u8 *val;
        int len;
 
        val = of_get_property(dp, "port-wwn", &len);
@@ -3373,9 +3371,8 @@ static void qla24xx_nvram_wwn_from_ofw(scsi_qla_host_t *ha, struct nvram_24xx *n
 {
 #ifdef CONFIG_SPARC
        struct pci_dev *pdev = ha->pdev;
-       struct pcidev_cookie *pcp = pdev->sysdata;
-       struct device_node *dp = pcp->prom_node;
-       u8 *val;
+       struct device_node *dp = pci_device_to_OF_node(pdev);
+       const u8 *val;
        int len;
 
        val = of_get_property(dp, "port-wwn", &len);