From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: [PATCH 1/2] ath10k: share board file loading code across FW APIs
Date: Mon, 23 Mar 2015 18:01:08 +0200 [thread overview]
Message-ID: <87lhind7p7.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1427114301-18886-2-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Mon, 23 Mar 2015 12:38:20 +0000")
Michal Kazior <michal.kazior@tieto.com> writes:
> There's no need to implement the same thing twice.
> Reduce code duplication.
>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
[...]
> @@ -730,6 +716,12 @@ static int ath10k_core_fetch_firmware_files(struct ath10k *ar)
> /* calibration file is optional, don't check for any errors */
> ath10k_fetch_cal_file(ar);
>
> + ret = ath10k_core_fetch_board_file(ar);
> + if (ret) {
> + ath10k_err(ar, "failed to fetch board file: %d\n", ret);
> + return ret;
> + }
> +
> ar->fw_api = 4;
> ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
There was a conflict here, please check the resolution in the pending
branch.
--
Kalle Valo
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2015-03-23 16:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-23 12:38 [PATCH 0/2] ath10k: load device specific board files Michal Kazior
2015-03-23 12:38 ` [PATCH 1/2] ath10k: share board file loading code across FW APIs Michal Kazior
2015-03-23 16:01 ` Kalle Valo [this message]
2015-03-24 7:04 ` Michal Kazior
2015-03-23 12:38 ` [PATCH 2/2] ath10k: allow loading device specific board files Michal Kazior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lhind7p7.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=michal.kazior@tieto.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).