Commit 2015d192 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

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: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f9ef6028

drivers/net/wireless/rt2x00/rt2800pci.c

+0 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE