PCI: fix up errors after dma bursting patch and CONFIG_PCI=n -- bug?

PCI: fix up errors after dma bursting patch and CONFIG_PCI=n -- bug?

[Kumar Gala]

Andrew,

In the patch from:

http://www.uwsg.iu.edu/hypermail/linux/kernel/0506.3/0985.html

Is the the following line suppose inside the if CONFIG_PCI=n

  #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>

---
diff --git a/include/linux/pci.h b/include/linux/pci.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -971,6 +971,8 @@ static inline int pci_enable_wake(struct
 
 #define	isa_bridge	((struct pci_dev *)NULL)
 
+#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
+
 #else
 
 /*
@@ -985,9 +987,6 @@ static inline int pci_proc_domain(struct
 	return 0;
 }
 #endif
-
-#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
-
 #endif /* !CONFIG_PCI */
 
 /* these helpers provide future and backwards compatibility

Re: PCI: fix up errors after dma bursting patch and CONFIG_PCI=n -- bug?

[Greg KH]

On Mon, Jul 25, 2005 at 11:52:43PM -0500, Kumar Gala wrote:
> Andrew,
> 
> In the patch from:
> 
> http://www.uwsg.iu.edu/hypermail/linux/kernel/0506.3/0985.html
> 
> Is the the following line suppose inside the if CONFIG_PCI=n
> 
>   #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
> 
> Signed-off-by: Kumar Gala <kumar.gala@freescale.com>

Hm, how did that work?

Bah, that pci.h file needs some major cleanups, I'll apply this patch
and clean up the rest to make it more sane.

thanks,

greg k-h

Re: PCI: fix up errors after dma bursting patch and CONFIG_PCI=n -- bug?

[Kumar Gala]

On Jul 26, 2005, at 12:50 PM, Greg KH wrote:

> On Mon, Jul 25, 2005 at 11:52:43PM -0500, Kumar Gala wrote:
>
>> Andrew,
>>
>> In the patch from:
>>
>> http://www.uwsg.iu.edu/hypermail/linux/kernel/0506.3/0985.html
>>
>> Is the the following line suppose inside the if CONFIG_PCI=n
>>
>>   #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do  
>> { }
>>
> while (0)
>
>>
>> Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
>>
>
> Hm, how did that work?

I'm somewhat baffled by that as well.  I did a full build regression  
of the 50 PPC32 defconfigs and only one broke because of this.  I'm  
still a bit confused as to why.

> Bah, that pci.h file needs some major cleanups, I'll apply this patch
> and clean up the rest to make it more sane.

Cool, just want to make sure the minor fix makes it to linus before  
2.6.13.

- kumar