Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: chromeos/compat-wireless/drivers/net/wireless/p54/led.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Common code for mac80211 Prism54 drivers 2 * Common code for mac80211 Prism54 drivers
3 * 3 *
4 * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net> 4 * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
5 * Copyright (c) 2007-2009, Christian Lamparter <chunkeey@web.de> 5 * Copyright (c) 2007-2009, Christian Lamparter <chunkeey@web.de>
6 * Copyright 2008, Johannes Berg <johannes@sipsolutions.net> 6 * Copyright 2008, Johannes Berg <johannes@sipsolutions.net>
7 * 7 *
8 * Based on: 8 * Based on:
9 * - the islsm (softmac prism54) driver, which is: 9 * - the islsm (softmac prism54) driver, which is:
10 * Copyright 2004-2006 Jean-Baptiste Note <jbnote@gmail.com>, et al. 10 * Copyright 2004-2006 Jean-Baptiste Note <jbnote@gmail.com>, et al.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 rerun = true; 51 rerun = true;
52 52
53 priv->leds[i].toggled = 53 priv->leds[i].toggled =
54 !!priv->leds[i].led_dev.brightness; 54 !!priv->leds[i].led_dev.brightness;
55 } else 55 } else
56 priv->softled_state &= ~BIT(i); 56 priv->softled_state &= ~BIT(i);
57 57
58 err = p54_set_leds(priv); 58 err = p54_set_leds(priv);
59 if (err && net_ratelimit()) 59 if (err && net_ratelimit())
60 wiphy_err(priv->hw->wiphy, 60 wiphy_err(priv->hw->wiphy,
61 » » » "failed to update leds (%d).\n", err); 61 » » » "failed to update LEDs (%d).\n", err);
62 62
63 if (rerun) 63 if (rerun)
64 ieee80211_queue_delayed_work(priv->hw, &priv->led_work, 64 ieee80211_queue_delayed_work(priv->hw, &priv->led_work,
65 msecs_to_jiffies(blink_delay)); 65 msecs_to_jiffies(blink_delay));
66 } 66 }
67 67
68 static void p54_led_brightness_set(struct led_classdev *led_dev, 68 static void p54_led_brightness_set(struct led_classdev *led_dev,
69 enum led_brightness brightness) 69 enum led_brightness brightness)
70 { 70 {
71 struct p54_led_dev *led = container_of(led_dev, struct p54_led_dev, 71 struct p54_led_dev *led = container_of(led_dev, struct p54_led_dev,
(...skipping 24 matching lines...) Expand all
96 wiphy_name(priv->hw->wiphy), name); 96 wiphy_name(priv->hw->wiphy), name);
97 led->hw_dev = priv->hw; 97 led->hw_dev = priv->hw;
98 led->index = led_index; 98 led->index = led_index;
99 led->led_dev.name = led->name; 99 led->led_dev.name = led->name;
100 led->led_dev.default_trigger = trigger; 100 led->led_dev.default_trigger = trigger;
101 led->led_dev.brightness_set = p54_led_brightness_set; 101 led->led_dev.brightness_set = p54_led_brightness_set;
102 102
103 err = led_classdev_register(wiphy_dev(priv->hw->wiphy), &led->led_dev); 103 err = led_classdev_register(wiphy_dev(priv->hw->wiphy), &led->led_dev);
104 if (err) 104 if (err)
105 wiphy_err(priv->hw->wiphy, 105 wiphy_err(priv->hw->wiphy,
106 » » » "failed to register %s led.\n", name); 106 » » » "Failed to register %s LED.\n", name);
107 else 107 else
108 led->registered = 1; 108 led->registered = 1;
109 109
110 return err; 110 return err;
111 } 111 }
112 112
113 int p54_init_leds(struct p54_common *priv) 113 int p54_init_leds(struct p54_common *priv)
114 { 114 {
115 int err; 115 int err;
116 116
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 for (i = 0; i < ARRAY_SIZE(priv->leds); i++) { 153 for (i = 0; i < ARRAY_SIZE(priv->leds); i++) {
154 if (priv->leds[i].registered) { 154 if (priv->leds[i].registered) {
155 priv->leds[i].registered = false; 155 priv->leds[i].registered = false;
156 priv->leds[i].toggled = 0; 156 priv->leds[i].toggled = 0;
157 led_classdev_unregister(&priv->leds[i].led_dev); 157 led_classdev_unregister(&priv->leds[i].led_dev);
158 } 158 }
159 } 159 }
160 160
161 cancel_delayed_work_sync(&priv->led_work); 161 cancel_delayed_work_sync(&priv->led_work);
162 } 162 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698