GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-19 13:11:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rt2x00: Move interface type assignments to generic code.

Browse source 
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 <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Gertjan van Wingerde 2009-11-08 12:30:14 +01:00 • committed by John W. Linville
parent f9ef6028b2
commit 2015d1920c
5 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/rt2x00/rt2800pci.c
View file

@ -1465,8 +1465,6 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
{ {
int retval; int retval;
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI);
rt2x00dev->priv = (void *)&rt2800pci_rt2800_ops; rt2x00dev->priv = (void *)&rt2800pci_rt2800_ops;
/* /*

2
drivers/net/wireless/rt2x00/rt2800usb.c
View file

@ -1074,8 +1074,6 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)
{ {
int retval; int retval;
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_USB);
rt2x00dev->priv = (void *)&rt2800usb_rt2800_ops; rt2x00dev->priv = (void *)&rt2800usb_rt2800_ops;
/* /*

2
drivers/net/wireless/rt2x00/rt2x00pci.c
View file

@ -310,6 +310,8 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
rt2x00dev->irq = pci_dev->irq; rt2x00dev->irq = pci_dev->irq;
rt2x00dev->name = pci_name(pci_dev); rt2x00dev->name = pci_name(pci_dev);
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI);
/* /*
* Determine RT chipset by reading PCI header. * Determine RT chipset by reading PCI header.
*/ */

5
drivers/net/wireless/rt2x00/rt2x00soc.c
View file

@ -93,6 +93,11 @@ int rt2x00soc_probe(struct platform_device *pdev,
rt2x00dev->irq = platform_get_irq(pdev, 0); rt2x00dev->irq = platform_get_irq(pdev, 0);
rt2x00dev->name = pdev->dev.driver->name; 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); rt2x00_set_chip_rt(rt2x00dev, chipset);
retval = rt2x00soc_alloc_reg(rt2x00dev); retval = rt2x00soc_alloc_reg(rt2x00dev);

2
drivers/net/wireless/rt2x00/rt2x00usb.c
View file

@ -653,6 +653,8 @@ int rt2x00usb_probe(struct usb_interface *usb_intf,
rt2x00dev->ops = ops; rt2x00dev->ops = ops;
rt2x00dev->hw = hw; rt2x00dev->hw = hw;
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_USB);
retval = rt2x00usb_alloc_reg(rt2x00dev); retval = rt2x00usb_alloc_reg(rt2x00dev);
if (retval) if (retval)
goto exit_free_device; goto exit_free_device;