aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2007-11-27 15:51:39 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:05:10 -0500
commit6f8a4da17ea2c8467f88a586ae1d6fcfe2c66222 (patch)
treedc6d4e50adfe470af65fe29ee7024cb51f384d05 /drivers/net
parent61af43c56bef2cfcb8f1d9aab4e766e0f7bdd893 (diff)
rt2x00: Remove redundant code in rfkill setup
In rt2x00rfkill.c, routine input_allocate_device() is called even though input_allocate_polled_device(), which was just called, includes a call to that routine. This patch, which has not been tested, removes the redundant code. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00rfkill.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
index bbbf51d8a742..74396372e95c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
@@ -136,12 +136,6 @@ int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
136 rt2x00dev->poll_dev->poll = rt2x00rfkill_poll; 136 rt2x00dev->poll_dev->poll = rt2x00rfkill_poll;
137 rt2x00dev->poll_dev->poll_interval = RFKILL_POLL_INTERVAL; 137 rt2x00dev->poll_dev->poll_interval = RFKILL_POLL_INTERVAL;
138 138
139 rt2x00dev->poll_dev->input = input_allocate_device();
140 if (!rt2x00dev->poll_dev->input) {
141 ERROR(rt2x00dev, "Failed to allocate input device.\n");
142 goto exit_free_polldev;
143 }
144
145 rt2x00dev->poll_dev->input->name = rt2x00dev->ops->name; 139 rt2x00dev->poll_dev->input->name = rt2x00dev->ops->name;
146 rt2x00dev->poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy); 140 rt2x00dev->poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy);
147 rt2x00dev->poll_dev->input->id.bustype = BUS_HOST; 141 rt2x00dev->poll_dev->input->id.bustype = BUS_HOST;