| Message ID | 1287422825-14999-2-git-send-email-nacc@us.ibm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Nishanth Aravamudan wrote: > Use set_dma_ops and remove now used-once oddly named temp pointer sd. > > Signed-off-by: Milton Miller <miltonm@bga.com> > Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> > Cc: benh@kernel.crashing.org > Cc: linuxppc-dev@lists.ozlabs.org > --- Maybe I forget to write you that this patch is already applied. http://git.monstr.eu/git/gitweb.cgi?p=linux-2.6-microblaze.git;a=commit;h=9a6df6cbfd903b6d9b4b1021f46d78601adfac77 Thanks, Michal
Hi, Nishanth Aravamudan wrote: > Use set_dma_ops and remove now used-once oddly named temp pointer sd. > > Signed-off-by: Milton Miller <miltonm@bga.com> > Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> > Cc: benh@kernel.crashing.org > Cc: linuxppc-dev@lists.ozlabs.org > --- > arch/microblaze/pci/pci-common.c | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) Is there any reason why you are sending me this patch again and again? Please STOP doing this! This patch was added to the mainline last week. Regards, Michal
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 55ef532..9631e1d 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -1075,8 +1075,6 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) bus->number, bus->self ? pci_name(bus->self) : "PHB"); list_for_each_entry(dev, &bus->devices, bus_list) { - struct dev_archdata *sd = &dev->dev.archdata; - /* Setup OF node pointer in archdata */ dev->dev.of_node = pci_device_to_OF_node(dev); @@ -1086,8 +1084,8 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) set_dev_node(&dev->dev, pcibus_to_node(dev->bus)); /* Hook up default DMA ops */ - sd->dma_ops = pci_dma_ops; - sd->dma_data = (void *)PCI_DRAM_OFFSET; + set_dma_ops(&dev->dev, pci_dma_ops); + dev->dev.archdata.dma_data = (void *)PCI_DRAM_OFFSET; /* Read default IRQs and fixup if necessary */ pci_read_irq_line(dev);