diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2010-01-08 18:14:10 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-12 14:20:45 -0500 |
commit | 28f63a4bb744ea81030219aba2337fddb10b380b (patch) | |
tree | 00b178ac42c9b33752a1fda714974dff64b3b4b2 | |
parent | 8ce1ef4a914aef8b9b90a2a2c670494168a2cca9 (diff) |
iwl-debugfs.c: remove unnecessary casts of void *
void pointers do not need to be cast to other pointer types.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 510bad918f20..4a2ac9311ba8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -125,7 +125,7 @@ static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file, | |||
125 | char __user *user_buf, | 125 | char __user *user_buf, |
126 | size_t count, loff_t *ppos) { | 126 | size_t count, loff_t *ppos) { |
127 | 127 | ||
128 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 128 | struct iwl_priv *priv = file->private_data; |
129 | char *buf; | 129 | char *buf; |
130 | int pos = 0; | 130 | int pos = 0; |
131 | 131 | ||
@@ -184,7 +184,7 @@ static ssize_t iwl_dbgfs_rx_statistics_read(struct file *file, | |||
184 | char __user *user_buf, | 184 | char __user *user_buf, |
185 | size_t count, loff_t *ppos) { | 185 | size_t count, loff_t *ppos) { |
186 | 186 | ||
187 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 187 | struct iwl_priv *priv = file->private_data; |
188 | char *buf; | 188 | char *buf; |
189 | int pos = 0; | 189 | int pos = 0; |
190 | int cnt; | 190 | int cnt; |
@@ -232,7 +232,7 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file, | |||
232 | ssize_t ret; | 232 | ssize_t ret; |
233 | int i; | 233 | int i; |
234 | int pos = 0; | 234 | int pos = 0; |
235 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 235 | struct iwl_priv *priv = file->private_data; |
236 | size_t bufsz; | 236 | size_t bufsz; |
237 | 237 | ||
238 | /* default is to dump the entire data segment */ | 238 | /* default is to dump the entire data segment */ |
@@ -306,7 +306,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file, | |||
306 | static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf, | 306 | static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf, |
307 | size_t count, loff_t *ppos) | 307 | size_t count, loff_t *ppos) |
308 | { | 308 | { |
309 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 309 | struct iwl_priv *priv = file->private_data; |
310 | struct iwl_station_entry *station; | 310 | struct iwl_station_entry *station; |
311 | int max_sta = priv->hw_params.max_stations; | 311 | int max_sta = priv->hw_params.max_stations; |
312 | char *buf; | 312 | char *buf; |
@@ -376,7 +376,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, | |||
376 | loff_t *ppos) | 376 | loff_t *ppos) |
377 | { | 377 | { |
378 | ssize_t ret; | 378 | ssize_t ret; |
379 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 379 | struct iwl_priv *priv = file->private_data; |
380 | int pos = 0, ofs = 0, buf_size = 0; | 380 | int pos = 0, ofs = 0, buf_size = 0; |
381 | const u8 *ptr; | 381 | const u8 *ptr; |
382 | char *buf; | 382 | char *buf; |
@@ -464,7 +464,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file, | |||
464 | static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf, | 464 | static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf, |
465 | size_t count, loff_t *ppos) | 465 | size_t count, loff_t *ppos) |
466 | { | 466 | { |
467 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 467 | struct iwl_priv *priv = file->private_data; |
468 | struct ieee80211_channel *channels = NULL; | 468 | struct ieee80211_channel *channels = NULL; |
469 | const struct ieee80211_supported_band *supp_band = NULL; | 469 | const struct ieee80211_supported_band *supp_band = NULL; |
470 | int pos = 0, i, bufsz = PAGE_SIZE; | 470 | int pos = 0, i, bufsz = PAGE_SIZE; |
@@ -537,7 +537,7 @@ static ssize_t iwl_dbgfs_status_read(struct file *file, | |||
537 | char __user *user_buf, | 537 | char __user *user_buf, |
538 | size_t count, loff_t *ppos) { | 538 | size_t count, loff_t *ppos) { |
539 | 539 | ||
540 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 540 | struct iwl_priv *priv = file->private_data; |
541 | char buf[512]; | 541 | char buf[512]; |
542 | int pos = 0; | 542 | int pos = 0; |
543 | const size_t bufsz = sizeof(buf); | 543 | const size_t bufsz = sizeof(buf); |
@@ -585,7 +585,7 @@ static ssize_t iwl_dbgfs_interrupt_read(struct file *file, | |||
585 | char __user *user_buf, | 585 | char __user *user_buf, |
586 | size_t count, loff_t *ppos) { | 586 | size_t count, loff_t *ppos) { |
587 | 587 | ||
588 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 588 | struct iwl_priv *priv = file->private_data; |
589 | int pos = 0; | 589 | int pos = 0; |
590 | int cnt = 0; | 590 | int cnt = 0; |
591 | char *buf; | 591 | char *buf; |
@@ -672,7 +672,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file, | |||
672 | static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf, | 672 | static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf, |
673 | size_t count, loff_t *ppos) | 673 | size_t count, loff_t *ppos) |
674 | { | 674 | { |
675 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 675 | struct iwl_priv *priv = file->private_data; |
676 | int pos = 0, i; | 676 | int pos = 0, i; |
677 | char buf[256]; | 677 | char buf[256]; |
678 | const size_t bufsz = sizeof(buf); | 678 | const size_t bufsz = sizeof(buf); |
@@ -695,7 +695,7 @@ static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf, | |||
695 | static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf, | 695 | static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf, |
696 | size_t count, loff_t *ppos) | 696 | size_t count, loff_t *ppos) |
697 | { | 697 | { |
698 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 698 | struct iwl_priv *priv = file->private_data; |
699 | int pos = 0; | 699 | int pos = 0; |
700 | char buf[256]; | 700 | char buf[256]; |
701 | const size_t bufsz = sizeof(buf); | 701 | const size_t bufsz = sizeof(buf); |
@@ -721,7 +721,7 @@ static ssize_t iwl_dbgfs_thermal_throttling_read(struct file *file, | |||
721 | char __user *user_buf, | 721 | char __user *user_buf, |
722 | size_t count, loff_t *ppos) | 722 | size_t count, loff_t *ppos) |
723 | { | 723 | { |
724 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 724 | struct iwl_priv *priv = file->private_data; |
725 | struct iwl_tt_mgmt *tt = &priv->thermal_throttle; | 725 | struct iwl_tt_mgmt *tt = &priv->thermal_throttle; |
726 | struct iwl_tt_restriction *restriction; | 726 | struct iwl_tt_restriction *restriction; |
727 | char buf[100]; | 727 | char buf[100]; |
@@ -781,7 +781,7 @@ static ssize_t iwl_dbgfs_disable_ht40_read(struct file *file, | |||
781 | char __user *user_buf, | 781 | char __user *user_buf, |
782 | size_t count, loff_t *ppos) | 782 | size_t count, loff_t *ppos) |
783 | { | 783 | { |
784 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 784 | struct iwl_priv *priv = file->private_data; |
785 | char buf[100]; | 785 | char buf[100]; |
786 | int pos = 0; | 786 | int pos = 0; |
787 | const size_t bufsz = sizeof(buf); | 787 | const size_t bufsz = sizeof(buf); |
@@ -838,7 +838,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_read(struct file *file, | |||
838 | char __user *user_buf, | 838 | char __user *user_buf, |
839 | size_t count, loff_t *ppos) | 839 | size_t count, loff_t *ppos) |
840 | { | 840 | { |
841 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 841 | struct iwl_priv *priv = file->private_data; |
842 | char buf[10]; | 842 | char buf[10]; |
843 | int pos, value; | 843 | int pos, value; |
844 | const size_t bufsz = sizeof(buf); | 844 | const size_t bufsz = sizeof(buf); |
@@ -856,7 +856,7 @@ static ssize_t iwl_dbgfs_current_sleep_command_read(struct file *file, | |||
856 | char __user *user_buf, | 856 | char __user *user_buf, |
857 | size_t count, loff_t *ppos) | 857 | size_t count, loff_t *ppos) |
858 | { | 858 | { |
859 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 859 | struct iwl_priv *priv = file->private_data; |
860 | char buf[200]; | 860 | char buf[200]; |
861 | int pos = 0, i; | 861 | int pos = 0, i; |
862 | const size_t bufsz = sizeof(buf); | 862 | const size_t bufsz = sizeof(buf); |
@@ -994,7 +994,7 @@ static ssize_t iwl_dbgfs_tx_queue_read(struct file *file, | |||
994 | char __user *user_buf, | 994 | char __user *user_buf, |
995 | size_t count, loff_t *ppos) { | 995 | size_t count, loff_t *ppos) { |
996 | 996 | ||
997 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 997 | struct iwl_priv *priv = file->private_data; |
998 | struct iwl_tx_queue *txq; | 998 | struct iwl_tx_queue *txq; |
999 | struct iwl_queue *q; | 999 | struct iwl_queue *q; |
1000 | char *buf; | 1000 | char *buf; |
@@ -1040,7 +1040,7 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file, | |||
1040 | char __user *user_buf, | 1040 | char __user *user_buf, |
1041 | size_t count, loff_t *ppos) { | 1041 | size_t count, loff_t *ppos) { |
1042 | 1042 | ||
1043 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 1043 | struct iwl_priv *priv = file->private_data; |
1044 | struct iwl_rx_queue *rxq = &priv->rxq; | 1044 | struct iwl_rx_queue *rxq = &priv->rxq; |
1045 | char buf[256]; | 1045 | char buf[256]; |
1046 | int pos = 0; | 1046 | int pos = 0; |
@@ -1086,7 +1086,7 @@ static ssize_t iwl_dbgfs_ucode_rx_stats_read(struct file *file, | |||
1086 | char __user *user_buf, | 1086 | char __user *user_buf, |
1087 | size_t count, loff_t *ppos) | 1087 | size_t count, loff_t *ppos) |
1088 | { | 1088 | { |
1089 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 1089 | struct iwl_priv *priv = file->private_data; |
1090 | int pos = 0; | 1090 | int pos = 0; |
1091 | char *buf; | 1091 | char *buf; |
1092 | int bufsz = sizeof(struct statistics_rx_phy) * 20 + | 1092 | int bufsz = sizeof(struct statistics_rx_phy) * 20 + |
@@ -1400,7 +1400,7 @@ static ssize_t iwl_dbgfs_ucode_tx_stats_read(struct file *file, | |||
1400 | char __user *user_buf, | 1400 | char __user *user_buf, |
1401 | size_t count, loff_t *ppos) | 1401 | size_t count, loff_t *ppos) |
1402 | { | 1402 | { |
1403 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 1403 | struct iwl_priv *priv = file->private_data; |
1404 | int pos = 0; | 1404 | int pos = 0; |
1405 | char *buf; | 1405 | char *buf; |
1406 | int bufsz = (sizeof(struct statistics_tx) * 24) + 250; | 1406 | int bufsz = (sizeof(struct statistics_tx) * 24) + 250; |
@@ -1542,7 +1542,7 @@ static ssize_t iwl_dbgfs_ucode_general_stats_read(struct file *file, | |||
1542 | char __user *user_buf, | 1542 | char __user *user_buf, |
1543 | size_t count, loff_t *ppos) | 1543 | size_t count, loff_t *ppos) |
1544 | { | 1544 | { |
1545 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 1545 | struct iwl_priv *priv = file->private_data; |
1546 | int pos = 0; | 1546 | int pos = 0; |
1547 | char *buf; | 1547 | char *buf; |
1548 | int bufsz = sizeof(struct statistics_general) * 4 + 250; | 1548 | int bufsz = sizeof(struct statistics_general) * 4 + 250; |
@@ -1633,7 +1633,7 @@ static ssize_t iwl_dbgfs_sensitivity_read(struct file *file, | |||
1633 | char __user *user_buf, | 1633 | char __user *user_buf, |
1634 | size_t count, loff_t *ppos) { | 1634 | size_t count, loff_t *ppos) { |
1635 | 1635 | ||
1636 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 1636 | struct iwl_priv *priv = file->private_data; |
1637 | int pos = 0; | 1637 | int pos = 0; |
1638 | int cnt = 0; | 1638 | int cnt = 0; |
1639 | char *buf; | 1639 | char *buf; |
@@ -1714,7 +1714,7 @@ static ssize_t iwl_dbgfs_chain_noise_read(struct file *file, | |||
1714 | char __user *user_buf, | 1714 | char __user *user_buf, |
1715 | size_t count, loff_t *ppos) { | 1715 | size_t count, loff_t *ppos) { |
1716 | 1716 | ||
1717 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 1717 | struct iwl_priv *priv = file->private_data; |
1718 | int pos = 0; | 1718 | int pos = 0; |
1719 | int cnt = 0; | 1719 | int cnt = 0; |
1720 | char *buf; | 1720 | char *buf; |
@@ -1772,7 +1772,7 @@ static ssize_t iwl_dbgfs_tx_power_read(struct file *file, | |||
1772 | char __user *user_buf, | 1772 | char __user *user_buf, |
1773 | size_t count, loff_t *ppos) { | 1773 | size_t count, loff_t *ppos) { |
1774 | 1774 | ||
1775 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 1775 | struct iwl_priv *priv = file->private_data; |
1776 | char buf[128]; | 1776 | char buf[128]; |
1777 | int pos = 0; | 1777 | int pos = 0; |
1778 | ssize_t ret; | 1778 | ssize_t ret; |
@@ -1823,7 +1823,7 @@ static ssize_t iwl_dbgfs_power_save_status_read(struct file *file, | |||
1823 | char __user *user_buf, | 1823 | char __user *user_buf, |
1824 | size_t count, loff_t *ppos) | 1824 | size_t count, loff_t *ppos) |
1825 | { | 1825 | { |
1826 | struct iwl_priv *priv = (struct iwl_priv *)file->private_data; | 1826 | struct iwl_priv *priv = file->private_data; |
1827 | char buf[60]; | 1827 | char buf[60]; |
1828 | int pos = 0; | 1828 | int pos = 0; |
1829 | const size_t bufsz = sizeof(buf); | 1829 | const size_t bufsz = sizeof(buf); |