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

Commit 49060383 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: remove unnecessary argument to iwl_drv_start() 



When iwl_drv_start() is called, trans->cfg must already be set, so
there's no need to pass cfg separately, since it can be accessed
directly from trans->cfg.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 0d7f1b99

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

+2 −3
Original line number Diff line number Diff line
@@ -1504,8 +1504,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
	kfree(pieces);

}



struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,

			      const struct iwl_cfg *cfg)

struct iwl_drv *iwl_drv_start(struct iwl_trans *trans)

{

	struct iwl_drv *drv;

	int ret;
@@ -1518,7 +1517,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans, 


	drv->trans = trans;

	drv->dev = trans->dev;

	drv->cfg = cfg;

	drv->cfg = trans->cfg;



	init_completion(&drv->request_firmware_complete);

	INIT_LIST_HEAD(&drv->list);

drivers/net/wireless/intel/iwlwifi/iwl-drv.h

+1 −3
Original line number Diff line number Diff line
@@ -118,15 +118,13 @@ struct iwl_cfg; 
 * iwl_drv_start - start the drv

 *

 * @trans_ops: the ops of the transport

 * @cfg: device specific constants / virtual functions

 *

 * starts the driver: fetches the firmware. This should be called by bus

 * specific system flows implementations. For example, the bus specific probe

 * function should do bus related operations only, and then call to this

 * function. It returns the driver object or %NULL if an error occurred.

 */

struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,

			      const struct iwl_cfg *cfg);

struct iwl_drv *iwl_drv_start(struct iwl_trans *trans);



/**

 * iwl_drv_stop - stop the drv

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
#endif



	pci_set_drvdata(pdev, iwl_trans);

	iwl_trans->drv = iwl_drv_start(iwl_trans, cfg);

	iwl_trans->drv = iwl_drv_start(iwl_trans);



	if (IS_ERR(iwl_trans->drv)) {

		ret = PTR_ERR(iwl_trans->drv);