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: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Luca Coelho
2016-12-13 09:48:57 +02:00
parent 0d7f1b993b
commit 49060383a7
3 changed files with 4 additions and 7 deletions

View File

@ -1504,8 +1504,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
kfree(pieces); kfree(pieces);
} }
struct iwl_drv *iwl_drv_start(struct iwl_trans *trans, struct iwl_drv *iwl_drv_start(struct iwl_trans *trans)
const struct iwl_cfg *cfg)
{ {
struct iwl_drv *drv; struct iwl_drv *drv;
int ret; int ret;
@ -1518,7 +1517,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,
drv->trans = trans; drv->trans = trans;
drv->dev = trans->dev; drv->dev = trans->dev;
drv->cfg = cfg; drv->cfg = trans->cfg;
init_completion(&drv->request_firmware_complete); init_completion(&drv->request_firmware_complete);
INIT_LIST_HEAD(&drv->list); INIT_LIST_HEAD(&drv->list);

View File

@ -118,15 +118,13 @@ struct iwl_cfg;
* iwl_drv_start - start the drv * iwl_drv_start - start the drv
* *
* @trans_ops: the ops of the transport * @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 * starts the driver: fetches the firmware. This should be called by bus
* specific system flows implementations. For example, the bus specific probe * specific system flows implementations. For example, the bus specific probe
* function should do bus related operations only, and then call to this * function should do bus related operations only, and then call to this
* function. It returns the driver object or %NULL if an error occurred. * function. It returns the driver object or %NULL if an error occurred.
*/ */
struct iwl_drv *iwl_drv_start(struct iwl_trans *trans, struct iwl_drv *iwl_drv_start(struct iwl_trans *trans);
const struct iwl_cfg *cfg);
/** /**
* iwl_drv_stop - stop the drv * iwl_drv_stop - stop the drv

View File

@ -677,7 +677,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
#endif #endif
pci_set_drvdata(pdev, iwl_trans); 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)) { if (IS_ERR(iwl_trans->drv)) {
ret = PTR_ERR(iwl_trans->drv); ret = PTR_ERR(iwl_trans->drv);