aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-phy-db.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-03-22 17:59:52 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-04-18 10:31:11 -0400
commit4b9844f5d887e31c18b9aad862b7ef5fde016d9b (patch)
tree21f48f3381ec9fca18974f8b1261bb44928aef8c /drivers/net/wireless/iwlwifi/iwl-phy-db.c
parent93faaeea4f28731fa7caf9db870f3f73b6047ea6 (diff)
iwlwifi: don't use shared for the logger any more
Each modules will hold a pointer to struct device instead. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-phy-db.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-phy-db.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
index 1a791af82d15..f166955340fe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-phy-db.c
+++ b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
@@ -65,14 +65,13 @@
65#include <linux/string.h> 65#include <linux/string.h>
66 66
67#include "iwl-debug.h" 67#include "iwl-debug.h"
68#include "iwl-shared.h"
69#include "iwl-dev.h" 68#include "iwl-dev.h"
70 69
71#include "iwl-phy-db.h" 70#include "iwl-phy-db.h"
72 71
73#define CHANNEL_NUM_SIZE 4 /* num of channels in calib_ch size */ 72#define CHANNEL_NUM_SIZE 4 /* num of channels in calib_ch size */
74 73
75struct iwl_phy_db *iwl_phy_db_init(struct iwl_shared *shrd) 74struct iwl_phy_db *iwl_phy_db_init(struct device *dev)
76{ 75{
77 struct iwl_phy_db *phy_db = kzalloc(sizeof(struct iwl_phy_db), 76 struct iwl_phy_db *phy_db = kzalloc(sizeof(struct iwl_phy_db),
78 GFP_KERNEL); 77 GFP_KERNEL);
@@ -80,7 +79,7 @@ struct iwl_phy_db *iwl_phy_db_init(struct iwl_shared *shrd)
80 if (!phy_db) 79 if (!phy_db)
81 return phy_db; 80 return phy_db;
82 81
83 phy_db->shrd = shrd; 82 phy_db->dev = dev;
84 83
85 /* TODO: add default values of the phy db. */ 84 /* TODO: add default values of the phy db. */
86 return phy_db; 85 return phy_db;