diff options
| author | Jesse Barnes <jbarnes@sgi.com> | 2005-01-11 00:23:15 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-01-11 00:23:15 -0800 |
| commit | 468e7edfda2dbfec11463b8b0194a2dd38f98d5c (patch) | |
| tree | 8cfaa7374516553e354d0c78c68b854524d5740e /arch | |
| parent | 62fec43e0da707f56335afafe5df033a156d06b2 (diff) | |
| download | history-468e7edfda2dbfec11463b8b0194a2dd38f98d5c.tar.gz | |
[IA64-SGI] io_init.c: gcc4 fixes for sn2
This patch is needed since "warning: use of cast expressions as lvalues is
deprecated" turned into an error in gcc4. We can use the convenience macros
for read access and explicit assignments for initialization. I thought about
using Alexandre's fixes, but this seemed a little simpler.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/sn/kernel/io_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index 551ed01302462e..001880812b7c8d 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c @@ -202,7 +202,7 @@ static void sn_pci_fixup_slot(struct pci_dev *dev) struct pci_dev *host_pci_dev; int status = 0; - SN_PCIDEV_INFO(dev) = kmalloc(sizeof(struct pcidev_info), GFP_KERNEL); + dev->sysdata = kmalloc(sizeof(struct pcidev_info), GFP_KERNEL); if (SN_PCIDEV_INFO(dev) <= 0) BUG(); /* Cannot afford to run out of memory */ memset(SN_PCIDEV_INFO(dev), 0, sizeof(struct pcidev_info)); @@ -310,8 +310,8 @@ static void sn_pci_controller_fixup(int segment, int busnum) * after this point. */ - PCI_CONTROLLER(bus) = controller; - SN_PCIBUS_BUSSOFT(bus) = provider_soft; + bus->sysdata = controller; + PCI_CONTROLLER(bus)->platform_data = provider_soft; nasid = NASID_GET(SN_PCIBUS_BUSSOFT(bus)->bs_base); cnode = nasid_to_cnodeid(nasid); |