summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00soc.c
diff options
context:
space:
mode:
authorGertjan van Wingerde <gwingerde@gmail.com>2010-02-13 20:55:48 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-02-15 16:14:10 -0500
commit714fa6636331d33c6045efe394f36c964a6c14ee (patch)
treedcdb5f14cd2275cec4dac094327d3b3524e201de /drivers/net/wireless/rt2x00/rt2x00soc.c
parentcea90e55969ff70b970d64d564076a5469331527 (diff)
rt2x00: Reorganize RT chipset setting for PCI/SOC devices.
Don't set the RT chipset for a device from within the generic PCI/SOC code, but rather from the individual drivers, so that individual drivers have more control over what RT chipset is set. Preparation for chip handling updates for rt2800 devices. Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00soc.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00soc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.c b/drivers/net/wireless/rt2x00/rt2x00soc.c
index 0d6b43afc4e..4efdc96010f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00soc.c
+++ b/drivers/net/wireless/rt2x00/rt2x00soc.c
@@ -71,9 +71,7 @@ exit:
return -ENOMEM;
}
-int rt2x00soc_probe(struct platform_device *pdev,
- const unsigned short chipset,
- const struct rt2x00_ops *ops)
+int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops)
{
struct ieee80211_hw *hw;
struct rt2x00_dev *rt2x00dev;
@@ -95,7 +93,6 @@ int rt2x00soc_probe(struct platform_device *pdev,
rt2x00dev->name = pdev->dev.driver->name;
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_SOC);
- rt2x00_set_chip_rt(rt2x00dev, chipset);
retval = rt2x00soc_alloc_reg(rt2x00dev);
if (retval)