Skip to contentSkip to conversation

rt2x00: fix rt2800pci compilation with SoC

PATCH In review Helmut Schaa 3 participants 5 messages Mar 2, 2010 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rt2x00: fix rt2800pci compilation with SoC

Compiling rt2800pci with CONFIG_RT2800PCI_SOC fails with "... rt2880pci.c:
error: incompatible type for argument 2 of 'rt2x00soc_probe'".

Fix this by using &rt2800pci_ops instead of rt2800pci_ops.

---

Just noticed that error while trying to compile rt2800pci for a Ralink SoC board.

drivers/net/wireless/rt2x00/rt2800pci.c +1 -1
index 0e4c417..f71e83b 100644
@@ -1225,7 +1225,7 @@ MODULE_LICENSE("GPL");
 #ifdef CONFIG_RT2800PCI_SOC
 static int rt2800soc_probe(struct platform_device *pdev)
 {
-       return rt2x00soc_probe(pdev, rt2800pci_ops);
+       return rt2x00soc_probe(pdev, &rt2800pci_ops);
 }
 
 static struct platform_driver rt2800soc_driver = {
#2 lore raw
Quoted 4 lines · Gertjan van Wingerde
Quoted 3 lines · Helmut Schaa

Compiling rt2800pci with CONFIG_RT2800PCI_SOC fails with "... rt2880pci.c:
error: incompatible type for argument 2 of 'rt2x00soc_probe'".

Quoted 8 lines
Quoted 4 lines

Fix this by using &rt2800pci_ops instead of rt2800pci_ops.

---

John, this is probably one that should go to wireless-2.6.

I agree, which is why I fixed the whitespace damage and applied it...grrr...

John

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#3 lore raw

Am Dienstag 02 März 2010 schrieb John W. Linville:

Quoted 7 lines · Gertjan van Wingerde
Quoted 6 lines · Helmut Schaa
Quoted 5 lines

Compiling rt2800pci with CONFIG_RT2800PCI_SOC fails with "... rt2880pci.c:
error: incompatible type for argument 2 of 'rt2x00soc_probe'".

Fix this by using &rt2800pci_ops instead of rt2800pci_ops.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

---

John, this is probably one that should go to wireless-2.6.

I agree, which is why I fixed the whitespace damage and applied it...grrr...

Oops, sorry John.

Thank you,
Helmut

#4 lore raw
In reply to John W. Linville
Quoted 7 lines · John W. Linville
Quoted 6 lines · Gertjan van Wingerde
Quoted 5 lines · Helmut Schaa

Compiling rt2800pci with CONFIG_RT2800PCI_SOC fails with "... rt2880pci.c:
error: incompatible type for argument 2 of 'rt2x00soc_probe'".

Fix this by using &rt2800pci_ops instead of rt2800pci_ops.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

---

John, this is probably one that should go to wireless-2.6.

I agree, which is why I fixed the whitespace damage and applied it...grrr...

OK. Thanks for that.

---
Gertjan.