On Wed, Feb 3, 2016 at 11:06 AM, Mimi Zohar <[email protected]> wrote: > From: "Luis R. Rodriguez" <[email protected]> > > Simplify a few of the *generic* shared dev_warn() and dev_dbg() > print messages for three reasons: > > 0) 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. > > 1) This will also help generalize shared code as much as possible > later in the future in consideration for a new extensible firmware > API which will enable to separate usermode helper code out as much > as possible. > > 2) Kees Cook pointed out the the prints already have the device > associated as dev_*() helpers are used, that should help identify > the user and case in which the helpers are used. That should provide > enough context and simplifies the messages further. > > v4: generalize debug/warn messages even further as suggested by > Kees Cook. > > Cc: Rusty Russell <[email protected]> > Cc: Andrew Morton <[email protected]> > Cc: Greg Kroah-Hartman <[email protected]> > Cc: David Howells <[email protected]> > Cc: Kees Cook <[email protected]> > Cc: Casey Schaufler <[email protected]> > Cc: Ming Lei <[email protected]> > Cc: Takashi Iwai <[email protected]> > Cc: Vojtěch Pavlík <[email protected]> > Cc: Kyle McMartin <[email protected]> > Cc: Matthew Garrett <[email protected]> > Cc: [email protected] > Signed-off-by: Luis R. Rodriguez <[email protected]> > Signed-off-by: Mimi Zohar <[email protected]>
Acked-by: Kees Cook <[email protected]> -Kees > --- > 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 8524450..3358f5d 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, "loading %s failed with error %d\n", > + path, rc); > else > break; > } > __putname(path); > > if (!rc) { > - dev_dbg(device, "firmware: direct-loading firmware %s\n", > + dev_dbg(device, "direct-loading %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, "using built-in %s\n", name); > return 0; /* assigned */ > } > > -- > 2.1.0 > -- Kees Cook Chrome OS & Brillo Security _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
