Skip to content

Commit

Permalink
rt2x00: Move interface type assignments to generic code.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gertjan van Wingerde authored and John W. Linville committed Nov 11, 2009
1 parent f9ef602 commit 2015d19
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
2 changes: 0 additions & 2 deletions drivers/net/wireless/rt2x00/rt2800pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/wireless/rt2x00/rt2800usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/rt2x00/rt2x00pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
5 changes: 5 additions & 0 deletions drivers/net/wireless/rt2x00/rt2x00soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/rt2x00/rt2x00usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2015d19

Please sign in to comment.