Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c15797e6 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: use IWL_* instead of dev_printk when possible 



Also remove a debug print when allocation error occurred.
The kernel will complain anyway.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 4d5ba61c

drivers/net/wireless/iwlwifi/iwl-agn.c

+5 −6
Original line number Diff line number Diff line
@@ -1419,32 +1419,31 @@ void iwl_set_hw_params(struct iwl_priv *priv) 


void iwl_debug_config(struct iwl_priv *priv)

{

	dev_printk(KERN_INFO, priv->trans->dev, "CONFIG_IWLWIFI_DEBUG "

	IWL_INFO(priv, "CONFIG_IWLWIFI_DEBUG "

#ifdef CONFIG_IWLWIFI_DEBUG

		"enabled\n");

#else

		"disabled\n");

#endif

	dev_printk(KERN_INFO, priv->trans->dev, "CONFIG_IWLWIFI_DEBUGFS "

	IWL_INFO(priv, "CONFIG_IWLWIFI_DEBUGFS "

#ifdef CONFIG_IWLWIFI_DEBUGFS

		"enabled\n");

#else

		"disabled\n");

#endif

	dev_printk(KERN_INFO, priv->trans->dev, "CONFIG_IWLWIFI_DEVICE_TRACING "

	IWL_INFO(priv, "CONFIG_IWLWIFI_DEVICE_TRACING "

#ifdef CONFIG_IWLWIFI_DEVICE_TRACING

		"enabled\n");

#else

		"disabled\n");

#endif



	dev_printk(KERN_INFO, priv->trans->dev, "CONFIG_IWLWIFI_DEVICE_TESTMODE "

	IWL_INFO(priv, "CONFIG_IWLWIFI_DEVICE_TESTMODE "

#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE

		"enabled\n");

#else

		"disabled\n");

#endif

	dev_printk(KERN_INFO, priv->trans->dev, "CONFIG_IWLWIFI_P2P "

	IWL_INFO(priv, "CONFIG_IWLWIFI_P2P "

#ifdef CONFIG_IWLWIFI_P2P

		"enabled\n");

#else

drivers/net/wireless/iwlwifi/iwl-drv.c

+4 −4
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
#include <linux/module.h>



#include "iwl-drv.h"

#include "iwl-debug.h"

#include "iwl-trans.h"

#include "iwl-op-mode.h"

#include "iwl-agn-hw.h"
@@ -892,10 +893,9 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans, 
	int ret;



	drv = kzalloc(sizeof(*drv), GFP_KERNEL);

	if (!drv) {

		dev_printk(KERN_ERR, trans->dev, "Couldn't allocate iwl_drv");

	if (!drv)

		return NULL;

	}



	drv->trans = trans;

	drv->dev = trans->dev;

	drv->cfg = cfg;
@@ -905,7 +905,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans, 
	ret = iwl_request_firmware(drv, true);



	if (ret) {

		dev_printk(KERN_ERR, trans->dev, "Couldn't request the fw");

		IWL_ERR(trans, "Couldn't request the fw\n");

		kfree(drv);

		drv = NULL;

	}