diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 00:50:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 00:50:37 -0500 |
commit | e880e87488d5bbf630dd716e6de8a53585614568 (patch) | |
tree | cab1f22bdd3adb3141df135f98dcabecabc181b1 /drivers/net/wireless/iwlwifi/mvm | |
parent | 118c216e16c5ccb028cd03a0dcd56d17a07ff8d7 (diff) | |
parent | c23fe83138ed7b11ad763cbe8bf98e5378c04bd6 (diff) |
Merge tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg KH:
"Here's the "big" driver core updates for 4.4-rc1. Primarily a bunch
of debugfs updates, with a smattering of minor driver core fixes and
updates as well.
All have been in linux-next for a long time"
* tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
debugfs: Add debugfs_create_ulong()
of: to support binding numa node to specified device in devicetree
debugfs: Add read-only/write-only bool file ops
debugfs: Add read-only/write-only size_t file ops
debugfs: Add read-only/write-only x64 file ops
debugfs: Consolidate file mode checks in debugfs_create_*()
Revert "mm: Check if section present during memory block (un)registering"
driver-core: platform: Provide helpers for multi-driver modules
mm: Check if section present during memory block (un)registering
devres: fix a for loop bounds check
CMA: fix CONFIG_CMA_SIZE_MBYTES overflow in 64bit
base/platform: assert that dev_pm_domain callbacks are called unconditionally
sysfs: correctly handle short reads on PREALLOC attrs.
base: soc: siplify ida usage
kobject: move EXPORT_SYMBOL() macros next to corresponding definitions
kobject: explain what kobject's sd field is
debugfs: document that debugfs_remove*() accepts NULL and error values
debugfs: Pass bool pointer to debugfs_create_bool()
ACPI / EC: Fix broken 64bit big-endian users of 'global_lock'
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h index c6327cd1d071..4bde2d027dcd 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h | |||
@@ -658,7 +658,7 @@ struct iwl_mvm { | |||
658 | const struct iwl_fw_bcast_filter *bcast_filters; | 658 | const struct iwl_fw_bcast_filter *bcast_filters; |
659 | #ifdef CONFIG_IWLWIFI_DEBUGFS | 659 | #ifdef CONFIG_IWLWIFI_DEBUGFS |
660 | struct { | 660 | struct { |
661 | u32 override; /* u32 for debugfs_create_bool */ | 661 | bool override; |
662 | struct iwl_bcast_filter_cmd cmd; | 662 | struct iwl_bcast_filter_cmd cmd; |
663 | } dbgfs_bcast_filtering; | 663 | } dbgfs_bcast_filtering; |
664 | #endif | 664 | #endif |
@@ -682,7 +682,7 @@ struct iwl_mvm { | |||
682 | bool disable_power_off; | 682 | bool disable_power_off; |
683 | bool disable_power_off_d3; | 683 | bool disable_power_off_d3; |
684 | 684 | ||
685 | u32 scan_iter_notif_enabled; /* must be u32 for debugfs_create_bool */ | 685 | bool scan_iter_notif_enabled; |
686 | 686 | ||
687 | struct debugfs_blob_wrapper nvm_hw_blob; | 687 | struct debugfs_blob_wrapper nvm_hw_blob; |
688 | struct debugfs_blob_wrapper nvm_sw_blob; | 688 | struct debugfs_blob_wrapper nvm_sw_blob; |
@@ -739,7 +739,7 @@ struct iwl_mvm { | |||
739 | int n_nd_channels; | 739 | int n_nd_channels; |
740 | bool net_detect; | 740 | bool net_detect; |
741 | #ifdef CONFIG_IWLWIFI_DEBUGFS | 741 | #ifdef CONFIG_IWLWIFI_DEBUGFS |
742 | u32 d3_wake_sysassert; /* must be u32 for debugfs_create_bool */ | 742 | bool d3_wake_sysassert; |
743 | bool d3_test_active; | 743 | bool d3_test_active; |
744 | bool store_d3_resume_sram; | 744 | bool store_d3_resume_sram; |
745 | void *d3_resume_sram; | 745 | void *d3_resume_sram; |