From 4465cf8721fd06f9904ef94292ba4f42c25a5e0a Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 8 May 2007 00:36:49 -0700 Subject: [PATCH] --- yaml --- r: 55256 b: refs/heads/master c: 15576bc8adb33d58867942385ae849cc48379610 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_init.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 32ed08de0d3d..c85feae3145e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28113a9941c8cb6ca90ab4a66876db84342a084b +refs/heads/master: 15576bc8adb33d58867942385ae849cc48379610 diff --git a/trunk/drivers/scsi/qla2xxx/qla_init.c b/trunk/drivers/scsi/qla2xxx/qla_init.c index 3e296ab845b6..089fc7940d8b 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_init.c +++ b/trunk/drivers/scsi/qla2xxx/qla_init.c @@ -13,7 +13,6 @@ #ifdef CONFIG_SPARC #include -#include #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);