From: Larry Finger Date: Tue, 27 Nov 2007 20:51:39 +0000 (+0100) Subject: rt2x00: Remove redundant code in rfkill setup X-Git-Tag: v2.6.25-rc1~1162^2~511 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f8a4da17ea2c8467f88a586ae1d6fcfe2c66222;p=linux-2.6 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 Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c index bbbf51d8a7..74396372e9 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) rt2x00dev->poll_dev->poll = rt2x00rfkill_poll; rt2x00dev->poll_dev->poll_interval = RFKILL_POLL_INTERVAL; - rt2x00dev->poll_dev->input = input_allocate_device(); - if (!rt2x00dev->poll_dev->input) { - ERROR(rt2x00dev, "Failed to allocate input device.\n"); - goto exit_free_polldev; - } - rt2x00dev->poll_dev->input->name = rt2x00dev->ops->name; rt2x00dev->poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy); rt2x00dev->poll_dev->input->id.bustype = BUS_HOST;