drivers/net/wireless/prism54/islpci_hotplug: Use the DMA_{64, 32}BIT_MASK constants
Subsystems (3)
PATCH 2/3 drivers/net/wireless/prism54/islpci_hotplug: Use the DMA_{64, 32}BIT_MASK constants
Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
---
kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/prism54/islpci_hotplug.c renamed from drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug +1 -1
@@ -125,7 +125,7 @@ prism54_probe(struct pci_dev *pdev, cons }/* enable PCI DMA */ -if (pci_set_dma_mask (pdev,0xffffffff )) { +if (pci_set_dma_mask (pdev,DMA_32BIT_MASK )) {printk (KERN_ERR "%s: 32-bit PCI DMA not supported" ,DRV_NAME ); goto do_pci_disable_device; }
_
Quoted 16 lines · On Sun, Mar 06, 2005 at 11:23:55PM +0100, [email protected] wrote:
Use the DMA_{64,32}BIT_MASK constants from
dma-mapping.hwhen callingpci_set_dma_mask()orpci_set_consistent_dma_mask()Signed-off-by Tobias Klauser <[email protected]>Signed-off-by Domen Puncer <[email protected]>---
kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)diff -puN
drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplugdrivers/net/wireless/prism54/islpci_hotplug.c
drivers/net/wireless/prism54/islpci_hotplug.c prism54_probe(struct pci_dev *pdev, cons · line 128
Quoted 5 lines
drivers/net/wireless/prism54/islpci_hotplug.c renamed from drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug +1
-1@@ -125,7 +125,7 @@ prism54_probe(struct pci_dev *pdev, cons }/* enable PCI DMA */ -if (pci_set_dma_mask (pdev,0xffffffff )) { +if (pci_set_dma_mask (pdev,DMA_32BIT_MASK )) {
Is this 2.4 backward compatible? If not we'll have to add to 2.4 compat file on prism54.
Luis
Signature · 1 line
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E
Quoted 19 lines · Luis R. Rodriguez
Quoted 17 lines · On Sun, Mar 06, 2005 at 11:23:55PM +0100, [email protected] wrote:
Use the DMA_{64,32}BIT_MASK constants from
dma-mapping.hwhen callingpci_set_dma_mask()orpci_set_consistent_dma_mask()Signed-off-by Tobias Klauser <[email protected]>Signed-off-by Domen Puncer <[email protected]>---
kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c| 2 +-1 files changed, 1 insertion(+), 1 deletion(-)diff -puN
drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplugdrivers/net/wireless/prism54/islpci_hotplug.cdrivers/net/wireless/prism54/islpci_hotplug.c renamed from drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug +0
-0@@ -125,7 +125,7 @@ prism54_probe(struct pci_dev *pdev, cons }
Quoted 7 lines
drivers/net/wireless/prism54/islpci_hotplug.c prism54_probe(struct pci_dev *pdev, cons · line 128
Quoted 3 lines
drivers/net/wireless/prism54/islpci_hotplug.c renamed from drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug +1
-1/* enable PCI DMA */ -if (pci_set_dma_mask (pdev,0xffffffff )) { +if (pci_set_dma_mask (pdev,DMA_32BIT_MASK )) {Is this 2.4 backward compatible? If not we'll have to add to 2.4 compat file on prism54.
Not compatible, but it is preferred to patch the file and add that definition to a compat header.
For pci_module_init(), it is preferred to keep pci_module_init() rather than adding compat gunk.
Jeff
Quoted 31 lines · Jeff Garzik
Quoted 22 lines · Luis R. Rodriguez
Quoted 20 lines · On Sun, Mar 06, 2005 at 11:23:55PM +0100, [email protected] wrote:
Use the DMA_{64,32}BIT_MASK constants from
dma-mapping.hwhen callingpci_set_dma_mask()orpci_set_consistent_dma_mask()Signed-off-by Tobias Klauser <[email protected]>Signed-off-by Domen Puncer <[email protected]>---
kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c| 2 +-1 files changed, 1 insertion(+), 1 deletion(-)diff -puN
drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplugdrivers/net/wireless/prism54/islpci_hotplug.c
---
kj/drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug 2005-03-05 16:12:02.000000000 +0100
+++kj-domen/drivers/net/wireless/prism54/islpci_hotplug.c2005-03-05
16:12:02.000000000 +0100(quoted diff) +0
-0@@ -125,7 +125,7 @@ prism54_probe(struct pci_dev *pdev, cons }Quoted 7 lines
drivers/net/wireless/prism54/islpci_hotplug.c prism54_probe(struct pci_dev *pdev, cons · line 128
Quoted 3 lines
drivers/net/wireless/prism54/islpci_hotplug.c renamed from drivers/net/wireless/prism54/islpci_hotplug.c~dma_mask-drivers_net_wireless_prism54_islpci_hotplug +1
-1/* enable PCI DMA */ -if (pci_set_dma_mask (pdev,0xffffffff )) { +if (pci_set_dma_mask (pdev,DMA_32BIT_MASK )) {Is this 2.4 backward compatible? If not we'll have to add to 2.4 compat file on prism54.
Quoted 7 lines
Not compatible, but it is preferred to patch the file and add that definition to a compat header.
For
pci_module_init(), it is preferred to keeppci_module_init()rather than adding compat gunk.Jeff
Alright, I'll add DMA_32BIT_MASK through compat and leave pci_module_init as is. That said:
Patch 1 applied
Patch 2 will be applied after compat work
Patch 3 rejected per Jeff's recomendation due to 2.4 compat
Luis
Signature · 1 line
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E
_______________________________________________
Prism54-devel mailing list
[email protected]
http://prism54.org/mailman/listinfo/prism54-devel
Quoted 9 lines · Luis R. Rodriguez
Alright, I'll add
DMA_32BIT_MASKthrough compat and leavepci_module_initas is. That said:Patch 1 applied
Patch 2 will be applied after compat work
Patch 3 rejected per Jeff's recomendation due to 2.4 compatLuis
This has been committed on to prism54 tree.
Luis
Signature · 1 line
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E
_______________________________________________
Prism54-devel mailing list
[email protected]
http://prism54.org/mailman/listinfo/prism54-devel