On Wed, Dec 23, 2015 at 1:34 PM, Luis R. Rodriguez
<mcg...@do-not-panic.com> wrote:
> From: "Luis R. Rodriguez" <mcg...@suse.com>
>
> Historically firmware_class code was added to help
> get device driver firmware binaries but these days
> request_firmware*() helpers are being repurposed for
> general system data needed by the kernel.
>
> Annotate this before we extend firmare_class more,
> as this is expected. We want to generalize the code
> as much as possible.
>
> Cc: Rusty Russell <ru...@rustcorp.com.au>
> Cc: Andrew Morton <a...@linux-foundation.org>
> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
> Cc: David Howells <dhowe...@redhat.com>
> Cc: Kees Cook <keesc...@chromium.org>
> Cc: Casey Schaufler <ca...@schaufler-ca.com>
> Cc: Ming Lei <ming....@canonical.com>
> Cc: Takashi Iwai <ti...@suse.de>
> Cc: Vojtěch Pavlík <vojt...@suse.cz>
> Cc: Kyle McMartin <k...@kernel.org>
> Cc: Matthew Garrett <mj...@srcf.ucam.org>
> Cc: linux-ker...@vger.kernel.org
> Signed-off-by: Luis R. Rodriguez <mcg...@suse.com>
> ---
>  drivers/base/firmware_class.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index 8524450e75bd..6f5fcda71a60 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -353,15 +353,15 @@ static int fw_get_filesystem_firmware(struct device 
> *device,
>                 rc = fw_read_file_contents(file, buf);
>                 fput(file);
>                 if (rc)
> -                       dev_warn(device, "firmware, attempted to load %s, but 
> failed with error %d\n",
> -                               path, rc);
> +                       dev_warn(device, "system data, attempted to load %s, 
> but failed with error %d\n",
> +                                path, rc);

Since dev_warn should already be prefixing the string, I would think
"firmware, " should just be removed entirely instead of replaced?

-Kees

>                 else
>                         break;
>         }
>         __putname(path);
>
>         if (!rc) {
> -               dev_dbg(device, "firmware: direct-loading firmware %s\n",
> +               dev_dbg(device, "system data: direct-loading firmware %s\n",
>                         buf->fw_id);
>                 mutex_lock(&fw_lock);
>                 set_bit(FW_STATUS_DONE, &buf->status);
> @@ -1051,7 +1051,7 @@ _request_firmware_prepare(struct firmware **firmware_p, 
> const char *name,
>         }
>
>         if (fw_get_builtin_firmware(firmware, name)) {
> -               dev_dbg(device, "firmware: using built-in firmware %s\n", 
> name);
> +               dev_dbg(device, "system data: using built-in system 
> data%s\n", name);
>                 return 0; /* assigned */
>         }
>
> --
> 2.6.2
>



-- 
Kees Cook
Chrome OS & Brillo Security
--
To unsubscribe from this list: send the line "unsubscribe 
linux-security-module" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to