Skip to contentSkip to conversation

PCI: remove pci_dac_dma_... APIs on mn10300

PATCH Applied Fernando Luis Vázquez Cao 3 participants 5 messages Dec 4, 2008 – Jun 29, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: remove pci_dac_dma_... APIs on mn10300

It seems that mn10300 made it upstream after Jan Beulich's pci_dac_dma_* cleanup work and still defines pci_dac_dma_supported(). This API is not required by the PCI subsystem anymore, so remove it.

---

include/asm-mn10300/pci.h +0 -4
diff -urNp linux-2.6.28-rc7-orig/include/asm-mn10300/pci.h linux-2.6.28-rc7/include/asm-mn10300/pci.h
@@ -70,10 +70,6 @@ struct pci_dev;
  */
 #define PCI_DMA_BUS_IS_PHYS	(1)
 
-
-/* This is always fine. */
-#define pci_dac_dma_supported(pci_dev, mask)	(0)
-
 /* Return the index of the PCI controller for device. */
 static inline int pci_controller_num(struct pci_dev *dev)
 {
Applied
#1 lore raw
Quoted 3 lines · Fernando Luis Vázquez Cao

It seems that mn10300 made it upstream after Jan Beulich's pci_dac_dma_* cleanup work and still defines pci_dac_dma_supported(). This API is not required by the PCI subsystem anymore, so remove it.

Applied this to my linux-next branch, thanks. I can drop it if the arch maintainer wants to send it instead though.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
#2 lore raw
In reply to Fernando Luis Vázquez Cao
Quoted 11 lines · Fernando Luis Vázquez Cao

It seems that mn10300 made it upstream after Jan Beulich's pci_dac_dma_* cleanup work and still defines pci_dac_dma_supported(). This API is not required by the PCI subsystem anymore, so remove it.

---

diff -urNp linux-2.6.28-rc7-orig/include/asm-mn10300/pci.h linux-2.6.28-rc7/include/asm-mn10300/pci.h

include/asm-mn10300/pci.h struct pci_dev; · line 75

Quoted 10 lines
include/asm-mn10300/pci.h +0 -4
@@ -70,10 +70,6 @@ struct pci_dev;
  */
 #define PCI_DMA_BUS_IS_PHYS	(1)
 
-
-/* This is always fine. */
-#define pci_dac_dma_supported(pci_dev, mask)	(0)
-
 /* Return the index of the PCI controller for device. */
 static inline int pci_controller_num(struct pci_dev *dev)
 {

It seems this patch slipped through the cracks. I will be replying to this email with an updated version rebased against 2.6.31-rc1.

Thanks,

Fernando

#3 lore raw

PATCH 1/1 PCI: remove pci_dac_dma_... APIs on mn10300

It seems that mn10300 made it upstream after Jan Beulich's pci_dac_dma_* cleanup work and still defines pci_dac_dma_supported(). This API is not required by the PCI subsystem anymore, so remove it.

---

arch/mn10300/include/asm/pci.h +0 -4
diff -urNp linux-2.6.31-rc1-orig/arch/mn10300/include/asm/pci.h linux-2.6.31-rc1/arch/mn10300/include/asm/pci.h
@@ -70,10 +70,6 @@ struct pci_dev;
  */
 #define PCI_DMA_BUS_IS_PHYS	(1)
 
-
-/* This is always fine. */
-#define pci_dac_dma_supported(pci_dev, mask)	(0)
-
 /* Return the index of the PCI controller for device. */
 static inline int pci_controller_num(struct pci_dev *dev)
 {
#4 lore raw
Quoted 15 lines · On Fri, 26 Jun 2009 11:27:41 +0900 Fernando Luis Vázquez Cao…

It seems that mn10300 made it upstream after Jan Beulich's pci_dac_dma_* cleanup work and still defines pci_dac_dma_supported(). This API is not required by the PCI subsystem anymore, so remove it.

---

diff -urNp linux-2.6.31-rc1-orig/arch/mn10300/include/asm/pci.h linux-2.6.31-rc1/arch/mn10300/include/asm/pci.h --- linux-2.6.31-rc1-orig/arch/mn10300/include/asm/pci.h

2009-06-26 10:58:02.012044068 +0900 +++

linux-2.6.31-rc1/arch/mn10300/include/asm/pci.h 2009-06-26
11:19:34.130867667 +0900 @@ -70,10 +70,6 @@ struct pci_dev; */
#define PCI_DMA_BUS_IS_PHYS (1)

arch/mn10300/include/asm/pci.h struct pci_dev; · line 75

Quoted 7 lines
arch/mn10300/include/asm/pci.h +0 -4
-
-/* This is always fine. */
-#define pci_dac_dma_supported(pci_dev, mask)	(0)
-
  /* Return the index of the PCI controller for device. */
  static inline int pci_controller_num(struct pci_dev *dev)
  {

Had to fix up some fuzz, but it's now in my for-linus branch. Thanks.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center