rt2x00: Move interface type assignments to generic code.
PATCH 1/1 rt2x00: Move interface type assignments to generic code.
Make sure all drivers can benefit of the assignment of the interface type of an adapter, instead of keeping it for rt2800 only.
Signed-off-by Gertjan van Wingerde <[email protected]>
--- drivers/net/wireless/rt2x00/rt2800pci.c | 2 -- drivers/net/wireless/rt2x00/rt2800usb.c | 2 -- drivers/net/wireless/rt2x00/rt2x00pci.c | 2 ++ drivers/net/wireless/rt2x00/rt2x00soc.c | 5 +++++ drivers/net/wireless/rt2x00/rt2x00usb.c | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-)
drivers/net/wireless/rt2x00/rt2800pci.c +0 -2
@@ -1465,8 +1465,6 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev) {int retval; -rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_PCI ); - rt2x00dev->priv = (void *)&rt2800pci_rt2800_ops;/*
drivers/net/wireless/rt2x00/rt2800usb.c +0 -2
@@ -1074,8 +1074,6 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev) {int retval; -rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_USB ); - rt2x00dev->priv = (void *)&rt2800usb_rt2800_ops;/*
drivers/net/wireless/rt2x00/rt2x00pci.c +2 -0
@@ -310,6 +310,8 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) rt2x00dev->irq = pci_dev->irq; rt2x00dev->name =pci_name (pci_dev); +rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_PCI ); +/* * Determine RT chipset by reading PCI header. */
drivers/net/wireless/rt2x00/rt2x00soc.c +5 -0
@@ -93,6 +93,11 @@ int rt2x00soc_probe(struct platform_device *pdev, rt2x00dev->irq =platform_get_irq (pdev,0 ); rt2x00dev->name = pdev->dev.driver->name; +/* +* SoC devices mimic PCI behavior. +*/ +rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_PCI ); +rt2x00_set_chip_rt (rt2x00dev, chipset); retval =rt2x00soc_alloc_reg (rt2x00dev);
drivers/net/wireless/rt2x00/rt2x00usb.c +2 -0
@@ -653,6 +653,8 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, rt2x00dev->ops = ops; rt2x00dev->hw = hw; +rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_USB ); + retval =rt2x00usb_alloc_reg (rt2x00dev);if (retval) goto exit_free_device;
Signature · 1 line
1.6.5.2
Quoted 4 lines · Gertjan van Wingerde
Make sure all drivers can benefit of the assignment of the interface type of an adapter, instead of keeping it for rt2800 only.
Signed-off-by Gertjan van Wingerde <[email protected]>
Acked-by Ivo van Doorn <[email protected]>
Quoted 76 lines
--- drivers/net/wireless/rt2x00/rt2800pci.c | 2 -- drivers/net/wireless/rt2x00/rt2800usb.c | 2 -- drivers/net/wireless/rt2x00/rt2x00pci.c | 2 ++ drivers/net/wireless/rt2x00/rt2x00soc.c | 5 +++++ drivers/net/wireless/rt2x00/rt2x00usb.c | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-)drivers/net/wireless/rt2x00/rt2800pci.c +0
-2@@ -1465,8 +1465,6 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev) {int retval; -rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_PCI ); - rt2x00dev->priv = (void *)&rt2800pci_rt2800_ops;/* drivers/net/wireless/rt2x00/rt2800usb.c +0
-2@@ -1074,8 +1074,6 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev) {int retval; -rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_USB ); - rt2x00dev->priv = (void *)&rt2800usb_rt2800_ops;/* drivers/net/wireless/rt2x00/rt2x00pci.c +2
-0@@ -310,6 +310,8 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) rt2x00dev->irq = pci_dev->irq; rt2x00dev->name =pci_name (pci_dev); +rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_PCI ); +/* * Determine RT chipset by reading PCI header. */ drivers/net/wireless/rt2x00/rt2x00soc.c +5
-0@@ -93,6 +93,11 @@ int rt2x00soc_probe(struct platform_device *pdev, rt2x00dev->irq =platform_get_irq (pdev,0 ); rt2x00dev->name = pdev->dev.driver->name; +/* +* SoC devices mimic PCI behavior. +*/ +rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_PCI ); +rt2x00_set_chip_rt (rt2x00dev, chipset); retval =rt2x00soc_alloc_reg (rt2x00dev);drivers/net/wireless/rt2x00/rt2x00usb.c +2
-0@@ -653,6 +653,8 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, rt2x00dev->ops = ops; rt2x00dev->hw = hw; +rt2x00_set_chip_intf (rt2x00dev,RT2X00_CHIP_INTF_USB ); + retval =rt2x00usb_alloc_reg (rt2x00dev);if (retval) goto exit_free_device;
Quoted 4 lines · On Sunday 08 November 2009 12:30:14 Gertjan van Wingerde wrote:
Make sure all drivers can benefit of the assignment of the interface type of an adapter, instead of keeping it for rt2800 only.
Signed-off-by Gertjan van Wingerde <[email protected]>
Thanks for fixing it.