X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=drivers%2Fnet%2Fwireless%2Fwl1251%2Fsdio.c;h=d141d838c800734af51daf7476e8488b7002be8e;hp=9b8461b14ed551652986fdf88614319f4d53fa46;hb=49a086ec91d906f90799a4937300a60107c27df4;hpb=6a1044716823b994fb0f736cd600629bab84d8f2

diff --git a/drivers/net/wireless/wl1251/sdio.c b/drivers/net/wireless/wl1251/sdio.c
index 9b8461b14ed5..d141d838c800 100644
--- a/drivers/net/wireless/wl1251/sdio.c
+++ b/drivers/net/wireless/wl1251/sdio.c
@@ -217,10 +217,64 @@ static struct wl1251_if_operations wl1251_sdio_ops = {
 	.power = wl1251_sdio_set_power,
 };
 
+static ssize_t
+wl1251_show_long_doze(struct device *dev, struct device_attribute *attr,
+	char *buf)
+{
+	struct wl1251 *wl = dev_get_drvdata(dev);
+	return sprintf(buf, "%d\n", wl->long_doze_mode);
+}
+
+static ssize_t
+wl1251_set_long_doze(struct device *dev, struct device_attribute *attr,
+	const char *buf, size_t count)
+{
+	struct wl1251 *wl = dev_get_drvdata(dev);
+	int val, ret;
+
+	ret = kstrtoint(buf, 10, &val);
+	if (ret < 0)
+		return ret;
+
+	wl->long_doze_mode = !!val;
+	return count;
+}
+
+static ssize_t
+wl1251_show_ps_rate_thr(struct device *dev, struct device_attribute *attr,
+	char *buf)
+{
+	struct wl1251 *wl = dev_get_drvdata(dev);
+	return sprintf(buf, "%u\n", wl->ps_rate_threshold);
+}
+
+static ssize_t
+wl1251_set_ps_rate_thr(struct device *dev, struct device_attribute *attr,
+	const char *buf, size_t count)
+{
+	struct wl1251 *wl = dev_get_drvdata(dev);
+	unsigned int val;
+	int ret;
+
+	ret = kstrtouint(buf, 10, &val);
+	if (ret < 0)
+		return ret;
+
+	wl->ps_rate_threshold = val;
+	return count;
+}
+
+static struct device_attribute wl1251_attrs[] = {
+	__ATTR(long_doze_mode, S_IRUGO | S_IWUGO,
+		wl1251_show_long_doze, wl1251_set_long_doze),
+	__ATTR(ps_rate_threshold, S_IRUGO | S_IWUGO,
+		wl1251_show_ps_rate_thr, wl1251_set_ps_rate_thr),
+};
+
 static int wl1251_sdio_probe(struct sdio_func *func,
 			     const struct sdio_device_id *id)
 {
-	int ret;
+	int ret, t;
 	struct wl1251 *wl;
 	struct ieee80211_hw *hw;
 	struct wl1251_sdio *wl_sdio;
@@ -291,6 +345,16 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 
 	sdio_set_drvdata(func, wl);
 
+	for (t = 0; t < ARRAY_SIZE(wl1251_attrs); t++) {
+		ret = device_create_file(&func->dev, &wl1251_attrs[t]);
+		if (ret) {
+			while (--t >= 0)
+				device_remove_file(&func->dev,
+						   &wl1251_attrs[t]);
+			goto out_free_irq;
+		}
+	}
+
 	/* Tell PM core that we don't need the card to be powered now */
 	pm_runtime_put_noidle(&func->dev);
 
@@ -314,10 +378,14 @@ static void __devexit wl1251_sdio_remove(struct sdio_func *func)
 {
 	struct wl1251 *wl = sdio_get_drvdata(func);
 	struct wl1251_sdio *wl_sdio = wl->if_priv;
+	int t;
 
 	/* Undo decrement done above in wl1251_probe */
 	pm_runtime_get_noresume(&func->dev);
 
+	for (t = 0; t < ARRAY_SIZE(wl1251_attrs); t++)
+		device_remove_file(&func->dev, &wl1251_attrs[t]);
+
 	if (wl->irq)
 		free_irq(wl->irq, wl);
 	wl1251_free_hw(wl);