diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-07-06 13:05:31 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2010-09-16 04:33:08 -0400 |
commit | 2b18ab36cf7e956fb5b5ee12847e94fc66d496f4 (patch) | |
tree | 3abdb07b9caa17e902f43cec478a42e8d9ab4990 | |
parent | dc880abef75e7c62c9048171f5112500f36a9244 (diff) |
net/wireless: use generic_file_llseek in debugfs
The default llseek operation is changing from
default_llseek to no_llseek, so all code relying on
the current behaviour needs to make that explicit.
The wireless driver infrastructure and some of the drivers
make use of generated debugfs files, so they cannot
be converted by our script that automatically determines
the right operation.
All these files use debugfs and they typically rely
on simple_read_from_buffer, so the best llseek operation
here is generic_file_llseek.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
-rw-r--r-- | drivers/misc/iwmc3200top/debugfs.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/b43/debugfs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/debugfs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/debugfs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00debug.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_debugfs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_debugfs.c | 2 | ||||
-rw-r--r-- | net/mac80211/debugfs.c | 2 | ||||
-rw-r--r-- | net/mac80211/debugfs_key.c | 2 | ||||
-rw-r--r-- | net/mac80211/debugfs_netdev.c | 1 | ||||
-rw-r--r-- | net/mac80211/debugfs_sta.c | 2 | ||||
-rw-r--r-- | net/wireless/debugfs.c | 1 |
13 files changed, 22 insertions, 0 deletions
diff --git a/drivers/misc/iwmc3200top/debugfs.c b/drivers/misc/iwmc3200top/debugfs.c index e9eda471f6e0..62fbaec48207 100644 --- a/drivers/misc/iwmc3200top/debugfs.c +++ b/drivers/misc/iwmc3200top/debugfs.c | |||
@@ -71,6 +71,7 @@ ssize_t iwmct_dbgfs_##name##_write(struct file *file, \ | |||
71 | static const struct file_operations iwmct_dbgfs_##name##_ops = { \ | 71 | static const struct file_operations iwmct_dbgfs_##name##_ops = { \ |
72 | .read = iwmct_dbgfs_##name##_read, \ | 72 | .read = iwmct_dbgfs_##name##_read, \ |
73 | .open = iwmct_dbgfs_open_file_generic, \ | 73 | .open = iwmct_dbgfs_open_file_generic, \ |
74 | .llseek = generic_file_llseek, \ | ||
74 | }; | 75 | }; |
75 | 76 | ||
76 | #define DEBUGFS_WRITE_FILE_OPS(name) \ | 77 | #define DEBUGFS_WRITE_FILE_OPS(name) \ |
@@ -78,6 +79,7 @@ ssize_t iwmct_dbgfs_##name##_write(struct file *file, \ | |||
78 | static const struct file_operations iwmct_dbgfs_##name##_ops = { \ | 79 | static const struct file_operations iwmct_dbgfs_##name##_ops = { \ |
79 | .write = iwmct_dbgfs_##name##_write, \ | 80 | .write = iwmct_dbgfs_##name##_write, \ |
80 | .open = iwmct_dbgfs_open_file_generic, \ | 81 | .open = iwmct_dbgfs_open_file_generic, \ |
82 | .llseek = generic_file_llseek, \ | ||
81 | }; | 83 | }; |
82 | 84 | ||
83 | #define DEBUGFS_READ_WRITE_FILE_OPS(name) \ | 85 | #define DEBUGFS_READ_WRITE_FILE_OPS(name) \ |
@@ -87,6 +89,7 @@ ssize_t iwmct_dbgfs_##name##_write(struct file *file, \ | |||
87 | .write = iwmct_dbgfs_##name##_write, \ | 89 | .write = iwmct_dbgfs_##name##_write, \ |
88 | .read = iwmct_dbgfs_##name##_read, \ | 90 | .read = iwmct_dbgfs_##name##_read, \ |
89 | .open = iwmct_dbgfs_open_file_generic, \ | 91 | .open = iwmct_dbgfs_open_file_generic, \ |
92 | .llseek = generic_file_llseek, \ | ||
90 | }; | 93 | }; |
91 | 94 | ||
92 | 95 | ||
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c index 80b19a44a407..59f59fa40334 100644 --- a/drivers/net/wireless/b43/debugfs.c +++ b/drivers/net/wireless/b43/debugfs.c | |||
@@ -627,6 +627,7 @@ out_unlock: | |||
627 | .open = b43_debugfs_open, \ | 627 | .open = b43_debugfs_open, \ |
628 | .read = b43_debugfs_read, \ | 628 | .read = b43_debugfs_read, \ |
629 | .write = b43_debugfs_write, \ | 629 | .write = b43_debugfs_write, \ |
630 | .llseek = generic_file_llseek, \ | ||
630 | }, \ | 631 | }, \ |
631 | .file_struct_offset = offsetof(struct b43_dfsentry, \ | 632 | .file_struct_offset = offsetof(struct b43_dfsentry, \ |
632 | file_##name), \ | 633 | file_##name), \ |
diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/b43legacy/debugfs.c index 1f85ac569fec..f232618f2cd1 100644 --- a/drivers/net/wireless/b43legacy/debugfs.c +++ b/drivers/net/wireless/b43legacy/debugfs.c | |||
@@ -334,6 +334,7 @@ out_unlock: | |||
334 | .open = b43legacy_debugfs_open, \ | 334 | .open = b43legacy_debugfs_open, \ |
335 | .read = b43legacy_debugfs_read, \ | 335 | .read = b43legacy_debugfs_read, \ |
336 | .write = b43legacy_debugfs_write, \ | 336 | .write = b43legacy_debugfs_write, \ |
337 | .llseek = generic_file_llseek, \ | ||
337 | }, \ | 338 | }, \ |
338 | .file_struct_offset = offsetof(struct b43legacy_dfsentry, \ | 339 | .file_struct_offset = offsetof(struct b43legacy_dfsentry, \ |
339 | file_##name), \ | 340 | file_##name), \ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index e96a1bb12783..a32d5d337649 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -87,6 +87,7 @@ static int iwl_dbgfs_open_file_generic(struct inode *inode, struct file *file) | |||
87 | static const struct file_operations iwl_dbgfs_##name##_ops = { \ | 87 | static const struct file_operations iwl_dbgfs_##name##_ops = { \ |
88 | .read = iwl_dbgfs_##name##_read, \ | 88 | .read = iwl_dbgfs_##name##_read, \ |
89 | .open = iwl_dbgfs_open_file_generic, \ | 89 | .open = iwl_dbgfs_open_file_generic, \ |
90 | .llseek = generic_file_llseek, \ | ||
90 | }; | 91 | }; |
91 | 92 | ||
92 | #define DEBUGFS_WRITE_FILE_OPS(name) \ | 93 | #define DEBUGFS_WRITE_FILE_OPS(name) \ |
@@ -94,6 +95,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = { \ | |||
94 | static const struct file_operations iwl_dbgfs_##name##_ops = { \ | 95 | static const struct file_operations iwl_dbgfs_##name##_ops = { \ |
95 | .write = iwl_dbgfs_##name##_write, \ | 96 | .write = iwl_dbgfs_##name##_write, \ |
96 | .open = iwl_dbgfs_open_file_generic, \ | 97 | .open = iwl_dbgfs_open_file_generic, \ |
98 | .llseek = generic_file_llseek, \ | ||
97 | }; | 99 | }; |
98 | 100 | ||
99 | 101 | ||
@@ -104,6 +106,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = { \ | |||
104 | .write = iwl_dbgfs_##name##_write, \ | 106 | .write = iwl_dbgfs_##name##_write, \ |
105 | .read = iwl_dbgfs_##name##_read, \ | 107 | .read = iwl_dbgfs_##name##_read, \ |
106 | .open = iwl_dbgfs_open_file_generic, \ | 108 | .open = iwl_dbgfs_open_file_generic, \ |
109 | .llseek = generic_file_llseek, \ | ||
107 | }; | 110 | }; |
108 | 111 | ||
109 | static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file, | 112 | static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file, |
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c index 651a79c8de8a..74e94cc10e01 100644 --- a/drivers/net/wireless/libertas/debugfs.c +++ b/drivers/net/wireless/libertas/debugfs.c | |||
@@ -696,6 +696,7 @@ out_unlock: | |||
696 | .open = open_file_generic, \ | 696 | .open = open_file_generic, \ |
697 | .read = (fread), \ | 697 | .read = (fread), \ |
698 | .write = (fwrite), \ | 698 | .write = (fwrite), \ |
699 | .llseek = generic_file_llseek, \ | ||
699 | } | 700 | } |
700 | 701 | ||
701 | struct lbs_debugfs_files { | 702 | struct lbs_debugfs_files { |
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c index b0498e7e7aae..7d6f19a2805e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00debug.c +++ b/drivers/net/wireless/rt2x00/rt2x00debug.c | |||
@@ -509,6 +509,7 @@ static const struct file_operations rt2x00debug_fop_##__name = {\ | |||
509 | .write = rt2x00debug_write_##__name, \ | 509 | .write = rt2x00debug_write_##__name, \ |
510 | .open = rt2x00debug_file_open, \ | 510 | .open = rt2x00debug_file_open, \ |
511 | .release = rt2x00debug_file_release, \ | 511 | .release = rt2x00debug_file_release, \ |
512 | .llseek = generic_file_llseek, \ | ||
512 | }; | 513 | }; |
513 | 514 | ||
514 | RT2X00DEBUGFS_OPS(csr, "0x%.8x\n", u32); | 515 | RT2X00DEBUGFS_OPS(csr, "0x%.8x\n", u32); |
diff --git a/drivers/net/wireless/wl12xx/wl1251_debugfs.c b/drivers/net/wireless/wl12xx/wl1251_debugfs.c index 5e4465ac08fa..a4ae7c4d94b5 100644 --- a/drivers/net/wireless/wl12xx/wl1251_debugfs.c +++ b/drivers/net/wireless/wl12xx/wl1251_debugfs.c | |||
@@ -50,6 +50,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf, \ | |||
50 | static const struct file_operations name## _ops = { \ | 50 | static const struct file_operations name## _ops = { \ |
51 | .read = name## _read, \ | 51 | .read = name## _read, \ |
52 | .open = wl1251_open_file_generic, \ | 52 | .open = wl1251_open_file_generic, \ |
53 | .llseek = generic_file_llseek, \ | ||
53 | }; | 54 | }; |
54 | 55 | ||
55 | #define DEBUGFS_ADD(name, parent) \ | 56 | #define DEBUGFS_ADD(name, parent) \ |
@@ -86,6 +87,7 @@ static ssize_t sub## _ ##name## _read(struct file *file, \ | |||
86 | static const struct file_operations sub## _ ##name## _ops = { \ | 87 | static const struct file_operations sub## _ ##name## _ops = { \ |
87 | .read = sub## _ ##name## _read, \ | 88 | .read = sub## _ ##name## _read, \ |
88 | .open = wl1251_open_file_generic, \ | 89 | .open = wl1251_open_file_generic, \ |
90 | .llseek = generic_file_llseek, \ | ||
89 | }; | 91 | }; |
90 | 92 | ||
91 | #define DEBUGFS_FWSTATS_ADD(sub, name) \ | 93 | #define DEBUGFS_FWSTATS_ADD(sub, name) \ |
diff --git a/drivers/net/wireless/wl12xx/wl1271_debugfs.c b/drivers/net/wireless/wl12xx/wl1271_debugfs.c index c239ef4d0b8d..6e25303a8e7f 100644 --- a/drivers/net/wireless/wl12xx/wl1271_debugfs.c +++ b/drivers/net/wireless/wl12xx/wl1271_debugfs.c | |||
@@ -51,6 +51,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf, \ | |||
51 | static const struct file_operations name## _ops = { \ | 51 | static const struct file_operations name## _ops = { \ |
52 | .read = name## _read, \ | 52 | .read = name## _read, \ |
53 | .open = wl1271_open_file_generic, \ | 53 | .open = wl1271_open_file_generic, \ |
54 | .llseek = generic_file_llseek, \ | ||
54 | }; | 55 | }; |
55 | 56 | ||
56 | #define DEBUGFS_ADD(name, parent) \ | 57 | #define DEBUGFS_ADD(name, parent) \ |
@@ -87,6 +88,7 @@ static ssize_t sub## _ ##name## _read(struct file *file, \ | |||
87 | static const struct file_operations sub## _ ##name## _ops = { \ | 88 | static const struct file_operations sub## _ ##name## _ops = { \ |
88 | .read = sub## _ ##name## _read, \ | 89 | .read = sub## _ ##name## _read, \ |
89 | .open = wl1271_open_file_generic, \ | 90 | .open = wl1271_open_file_generic, \ |
91 | .llseek = generic_file_llseek, \ | ||
90 | }; | 92 | }; |
91 | 93 | ||
92 | #define DEBUGFS_FWSTATS_ADD(sub, name) \ | 94 | #define DEBUGFS_FWSTATS_ADD(sub, name) \ |
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index a694c593ff6a..4a4d35c750c6 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c | |||
@@ -36,6 +36,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf, \ | |||
36 | static const struct file_operations name## _ops = { \ | 36 | static const struct file_operations name## _ops = { \ |
37 | .read = name## _read, \ | 37 | .read = name## _read, \ |
38 | .open = mac80211_open_file_generic, \ | 38 | .open = mac80211_open_file_generic, \ |
39 | .llseek = generic_file_llseek, \ | ||
39 | }; | 40 | }; |
40 | 41 | ||
41 | #define DEBUGFS_ADD(name) \ | 42 | #define DEBUGFS_ADD(name) \ |
@@ -346,6 +347,7 @@ static ssize_t stats_ ##name## _read(struct file *file, \ | |||
346 | static const struct file_operations stats_ ##name## _ops = { \ | 347 | static const struct file_operations stats_ ##name## _ops = { \ |
347 | .read = stats_ ##name## _read, \ | 348 | .read = stats_ ##name## _read, \ |
348 | .open = mac80211_open_file_generic, \ | 349 | .open = mac80211_open_file_generic, \ |
350 | .llseek = generic_file_llseek, \ | ||
349 | }; | 351 | }; |
350 | 352 | ||
351 | #define DEBUGFS_STATS_ADD(name, field) \ | 353 | #define DEBUGFS_STATS_ADD(name, field) \ |
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c index fa5e76e658ef..7cd8dd9fc240 100644 --- a/net/mac80211/debugfs_key.c +++ b/net/mac80211/debugfs_key.c | |||
@@ -32,6 +32,7 @@ static ssize_t key_##name##_read(struct file *file, \ | |||
32 | static const struct file_operations key_ ##name## _ops = { \ | 32 | static const struct file_operations key_ ##name## _ops = { \ |
33 | .read = key_##name##_read, \ | 33 | .read = key_##name##_read, \ |
34 | .open = mac80211_open_file_generic, \ | 34 | .open = mac80211_open_file_generic, \ |
35 | .llseek = generic_file_llseek, \ | ||
35 | } | 36 | } |
36 | 37 | ||
37 | #define KEY_FILE(name, format) \ | 38 | #define KEY_FILE(name, format) \ |
@@ -46,6 +47,7 @@ static const struct file_operations key_ ##name## _ops = { \ | |||
46 | static const struct file_operations key_ ##name## _ops = { \ | 47 | static const struct file_operations key_ ##name## _ops = { \ |
47 | .read = key_conf_##name##_read, \ | 48 | .read = key_conf_##name##_read, \ |
48 | .open = mac80211_open_file_generic, \ | 49 | .open = mac80211_open_file_generic, \ |
50 | .llseek = generic_file_llseek, \ | ||
49 | } | 51 | } |
50 | 52 | ||
51 | #define KEY_CONF_FILE(name, format) \ | 53 | #define KEY_CONF_FILE(name, format) \ |
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index 20b2998fa0ed..8ad33eef7dda 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c | |||
@@ -121,6 +121,7 @@ static const struct file_operations name##_ops = { \ | |||
121 | .read = ieee80211_if_read_##name, \ | 121 | .read = ieee80211_if_read_##name, \ |
122 | .write = (_write), \ | 122 | .write = (_write), \ |
123 | .open = mac80211_open_file_generic, \ | 123 | .open = mac80211_open_file_generic, \ |
124 | .llseek = generic_file_llseek, \ | ||
124 | } | 125 | } |
125 | 126 | ||
126 | #define __IEEE80211_IF_FILE_W(name) \ | 127 | #define __IEEE80211_IF_FILE_W(name) \ |
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 76839d4dfaac..6a8fdc372c43 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c | |||
@@ -36,6 +36,7 @@ static ssize_t sta_ ##name## _read(struct file *file, \ | |||
36 | static const struct file_operations sta_ ##name## _ops = { \ | 36 | static const struct file_operations sta_ ##name## _ops = { \ |
37 | .read = sta_##name##_read, \ | 37 | .read = sta_##name##_read, \ |
38 | .open = mac80211_open_file_generic, \ | 38 | .open = mac80211_open_file_generic, \ |
39 | .llseek = generic_file_llseek, \ | ||
39 | } | 40 | } |
40 | 41 | ||
41 | #define STA_OPS_RW(name) \ | 42 | #define STA_OPS_RW(name) \ |
@@ -43,6 +44,7 @@ static const struct file_operations sta_ ##name## _ops = { \ | |||
43 | .read = sta_##name##_read, \ | 44 | .read = sta_##name##_read, \ |
44 | .write = sta_##name##_write, \ | 45 | .write = sta_##name##_write, \ |
45 | .open = mac80211_open_file_generic, \ | 46 | .open = mac80211_open_file_generic, \ |
47 | .llseek = generic_file_llseek, \ | ||
46 | } | 48 | } |
47 | 49 | ||
48 | #define STA_FILE(name, field, format) \ | 50 | #define STA_FILE(name, field, format) \ |
diff --git a/net/wireless/debugfs.c b/net/wireless/debugfs.c index a4991a3efec0..3f9a57e96508 100644 --- a/net/wireless/debugfs.c +++ b/net/wireless/debugfs.c | |||
@@ -34,6 +34,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf, \ | |||
34 | static const struct file_operations name## _ops = { \ | 34 | static const struct file_operations name## _ops = { \ |
35 | .read = name## _read, \ | 35 | .read = name## _read, \ |
36 | .open = cfg80211_open_file_generic, \ | 36 | .open = cfg80211_open_file_generic, \ |
37 | .llseek = generic_file_llseek, \ | ||
37 | }; | 38 | }; |
38 | 39 | ||
39 | DEBUGFS_READONLY_FILE(rts_threshold, 20, "%d", | 40 | DEBUGFS_READONLY_FILE(rts_threshold, 20, "%d", |