forked from luck/tmp_suning_uos_patched
[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>
This commit is contained in:
parent
28113a9941
commit
15576bc8ad
@ -13,7 +13,6 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_SPARC
|
#ifdef CONFIG_SPARC
|
||||||
#include <asm/prom.h>
|
#include <asm/prom.h>
|
||||||
#include <asm/pbm.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* XXX(hch): this is ugly, but we don't want to pull in exioctl.h */
|
/* 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
|
#ifdef CONFIG_SPARC
|
||||||
struct pci_dev *pdev = ha->pdev;
|
struct pci_dev *pdev = ha->pdev;
|
||||||
struct pcidev_cookie *pcp = pdev->sysdata;
|
struct device_node *dp = pci_device_to_OF_node(pdev);
|
||||||
struct device_node *dp = pcp->prom_node;
|
const u8 *val;
|
||||||
u8 *val;
|
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
val = of_get_property(dp, "port-wwn", &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
|
#ifdef CONFIG_SPARC
|
||||||
struct pci_dev *pdev = ha->pdev;
|
struct pci_dev *pdev = ha->pdev;
|
||||||
struct pcidev_cookie *pcp = pdev->sysdata;
|
struct device_node *dp = pci_device_to_OF_node(pdev);
|
||||||
struct device_node *dp = pcp->prom_node;
|
const u8 *val;
|
||||||
u8 *val;
|
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
val = of_get_property(dp, "port-wwn", &len);
|
val = of_get_property(dp, "port-wwn", &len);
|
||||||
|
Loading…
Reference in New Issue
Block a user