From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: rusty@rustcorp.com.au, dhowells@redhat.com,
ming.lei@canonical.com, seth.forshee@canonical.com,
kyle@kernel.org
Cc: akpm@linux-foundation.org, gregkh@linuxfoundation.org,
keescook@chromium.org, casey@schaufler-ca.com, tiwai@suse.de,
mjg59@srcf.ucam.org, wireless-regdb@lists.infradead.org,
linux-wireless@vger.kernel.org, jlee@suse.com,
linux-kernel@vger.kernel.org,
"Luis R. Rodriguez" <mcgrof@suse.com>
Subject: [RFC v1 08/12] p54spi: use sysdata_file_request() for EEPROM optional system data
Date: Tue, 5 May 2015 17:44:26 -0700 [thread overview]
Message-ID: <1430873070-7290-9-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1430873070-7290-1-git-send-email-mcgrof@do-not-panic.com>
From: "Luis R. Rodriguez" <mcgrof@suse.com>
This converts the driver over from request_firmware_direct() to
the sysdata_file_request().
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
drivers/net/wireless/p54/p54spi.c | 49 +++++++++++++++++++++++----------------
1 file changed, 29 insertions(+), 20 deletions(-)
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index 63de5ee..0950ed6 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -24,6 +24,7 @@
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/firmware.h>
+#include <linux/sysdata.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/spi/spi.h>
@@ -184,33 +185,41 @@ static int p54spi_request_firmware(struct ieee80211_hw *dev)
return 0;
}
-static int p54spi_request_eeprom(struct ieee80211_hw *dev)
+static int p54spi_load_new_eeprom(void *context,
+ const struct sysdata_file *sysdata)
{
- struct p54s_priv *priv = dev->priv;
- const struct firmware *eeprom;
+ struct ieee80211_hw *dev = context;
int ret;
- /* allow users to customize their eeprom.
- */
+ ret = p54_parse_eeprom(dev, (void *) sysdata->data,
+ sysdata->size);
+ release_sysdata_file(sysdata);
- ret = request_firmware_direct(&eeprom, "3826.eeprom", &priv->spi->dev);
- if (ret < 0) {
-#ifdef CONFIG_P54_SPI_DEFAULT_EEPROM
- dev_info(&priv->spi->dev, "loading default eeprom...\n");
- ret = p54_parse_eeprom(dev, (void *) p54spi_eeprom,
- sizeof(p54spi_eeprom));
-#else
- dev_err(&priv->spi->dev, "Failed to request user eeprom\n");
-#endif /* CONFIG_P54_SPI_DEFAULT_EEPROM */
- } else {
- dev_info(&priv->spi->dev, "loading user eeprom...\n");
- ret = p54_parse_eeprom(dev, (void *) eeprom->data,
- (int)eeprom->size);
- release_firmware(eeprom);
- }
return ret;
}
+static int p54spi_load_default_eeprom(void *context)
+{
+ struct ieee80211_hw *dev = context;
+
+ return p54_parse_eeprom(dev, (void *) p54spi_eeprom,
+ sizeof(p54spi_eeprom));
+}
+
+static int p54spi_request_eeprom(struct ieee80211_hw *dev)
+{
+ struct p54s_priv *priv = dev->priv;
+ const struct sysdata_file_desc p54_spi_eeprom_sysdata = {
+ SYSDATA_DEFAULT_SYNC(p54spi_load_new_eeprom, dev),
+ .optional = !IS_ENABLED(CONFIG_P54_SPI_DEFAULT_EEPROM),
+ SYSDATA_SYNC_OPT_CB(p54spi_load_default_eeprom, dev),
+ };
+
+ return sysdata_file_request("3826.eeprom",
+ &p54_spi_eeprom_sysdata,
+ &priv->spi->dev);
+}
+
static int p54spi_upload_firmware(struct ieee80211_hw *dev)
{
struct p54s_priv *priv = dev->priv;
--
2.3.2.209.gd67f9d5.dirty
next prev parent reply other threads:[~2015-05-06 1:04 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-06 0:44 [RFC v1 00/12] kernel/firmware/wireless: firmware digital signature checks Luis R. Rodriguez
2015-05-06 0:44 ` [PATCH v1 01/12] kernel/params.c: export param_ops_bool_enable_only Luis R. Rodriguez
2015-05-08 17:56 ` Rusty Russell
2015-05-06 0:44 ` [PATCH v1 02/12] kernel: generalize module signing as system data signing Luis R. Rodriguez
2015-05-07 1:07 ` Rusty Russell
2015-05-06 0:44 ` [PATCH v1 03/12] crypto: qat - address recursive dependency when fw signing is enabled Luis R. Rodriguez
2015-05-06 3:33 ` Herbert Xu
2015-05-07 8:42 ` Paul Bolle
2015-05-07 18:06 ` Paul Bolle
2015-05-07 18:28 ` Luis R. Rodriguez
2015-05-07 20:14 ` Paul Bolle
2015-05-08 21:53 ` Paul Bolle
2015-05-12 16:08 ` Luis R. Rodriguez
2015-05-18 20:01 ` Luis R. Rodriguez
2015-05-18 20:45 ` Paul Bolle
2015-05-19 0:09 ` Luis R. Rodriguez
2015-05-19 8:02 ` Paul Bolle
2015-05-19 15:46 ` Luis R. Rodriguez
2015-05-19 22:59 ` Herbert Xu
2015-05-19 23:03 ` Herbert Xu
2015-05-19 23:05 ` Luis R. Rodriguez
2015-05-20 2:49 ` Herbert Xu
2015-05-20 9:00 ` Paul Bolle
2015-05-20 21:19 ` Luis R. Rodriguez
2015-05-06 0:44 ` [PATCH v1 04/12] firmware: fix possible use after free on name on asynchronous request Luis R. Rodriguez
2015-05-08 19:23 ` Luis R. Rodriguez
2015-05-06 0:44 ` [RFC v1 05/12] firmware: add firmware signature checking support Luis R. Rodriguez
2015-05-06 0:44 ` [RFC v1 06/12] firmware: generalize "firmware" as "system data" helpers Luis R. Rodriguez
2015-05-06 0:44 ` [RFC v1 07/12] firmware: add generic system data helpers with signature support Luis R. Rodriguez
2015-05-06 0:44 ` Luis R. Rodriguez [this message]
2015-05-06 0:44 ` [RFC v1 09/12] p54: use sysdata_file_request() and sysdata_file_request_async() Luis R. Rodriguez
2015-05-06 0:44 ` [RFC v1 10/12] ath9k_htc: " Luis R. Rodriguez
2015-05-06 0:44 ` [RFC v1 11/12] iwlwifi: " Luis R. Rodriguez
2015-05-06 7:03 ` Johannes Berg
2015-05-06 16:44 ` Luis R. Rodriguez
2015-05-06 0:44 ` [RFC v1 12/12] cfg80211: request for regulatory system data file Luis R. Rodriguez
2015-05-06 12:08 ` [PATCH v1 02/12] kernel: generalize module signing as system data signing David Howells
2015-05-06 16:57 ` [RFC v1 05/12] firmware: add firmware signature checking support David Howells
2015-05-06 17:31 ` Luis R. Rodriguez
2015-05-06 17:55 ` [RFC v1 00/12] kernel/firmware/wireless: firmware digital signature checks Luis R. Rodriguez
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=1430873070-7290-9-git-send-email-mcgrof@do-not-panic.com \
--to=mcgrof@do-not-panic.com \
--cc=akpm@linux-foundation.org \
--cc=casey@schaufler-ca.com \
--cc=dhowells@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=jlee@suse.com \
--cc=keescook@chromium.org \
--cc=kyle@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mcgrof@suse.com \
--cc=ming.lei@canonical.com \
--cc=mjg59@srcf.ucam.org \
--cc=rusty@rustcorp.com.au \
--cc=seth.forshee@canonical.com \
--cc=tiwai@suse.de \
--cc=wireless-regdb@lists.infradead.org \
/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).