Replaced make-linux with previous hwe version
This commit is contained in:
Ruben Rodriguez
parent
0afe929a5f
commit
5d7a1bcf9d
17 changed files with 1361 additions and 23950 deletions
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
files=`find -type f`
|
||||
while read -r line
|
||||
do
|
||||
./deblob-check $line
|
||||
done <<< "$files"
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,311 +0,0 @@
|
|||
#! /bin/sh
|
||||
|
||||
# Copyright (C) 2008-2017 Alexandre Oliva <lxoliva@fsfla.org>
|
||||
|
||||
# This program is part of GNU Linux-libre, a GNU project that
|
||||
# publishes scripts to clean up Linux so as to make it suitable for
|
||||
# use in the GNU Project and in Free System Distributions.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
|
||||
# USA
|
||||
|
||||
# deblob-main - prepare a GNU Linux-libre tarball out of a non-libre
|
||||
# Linux tarball. It expects the Linux release (mver, say 3.0) as the
|
||||
# first argument, the gnu sub-release (extra) as the second optional
|
||||
# argument, and the patch release (sver, say .13) as an optional third
|
||||
# argument. mver and sver are pasted together to form kver.
|
||||
|
||||
# linux-$kver.tar.bz2 and deblob-$mver must exist in the current
|
||||
# directory, and the line that sets kver and extra in deblob-$mver
|
||||
# must match mver and extra.
|
||||
|
||||
# The resulting tarball is put in linux-libre-$kver-gnu$extra.tar.bz2.
|
||||
# An uncompressed xdelta that produces linux-libre-$kver-gnu$extra.tar
|
||||
# out of linux-$kver.tar is put in linux-libre-$kver-gnu$extra.xdelta.
|
||||
# This xdelta can be distributed to enable third parties to easily
|
||||
# reconstruct the binary tarball starting out of sources downloaded
|
||||
# from kernel.org, but without distributing non-Free Software
|
||||
# yourself, because xdelta (unlike patches) is not reversible: the
|
||||
# removed bits are not present in it at all.
|
||||
|
||||
# xdelta version 3 uses different command line syntax, and it switched
|
||||
# to the more standardized but less efficient vcdiff file format.
|
||||
# This script will also produce a vcdiff file if xdelta3 is present,
|
||||
# and it expects the xdelta program to use the version 1 syntax.
|
||||
|
||||
# To enable you to check the differences between the tarballs, a patch
|
||||
# file is generated in linux-libre-$kver-gnu$extra.patch. This patch
|
||||
# file contains the non-Free blobs, even though in reversed form, so
|
||||
# its distribution is discouraged.
|
||||
|
||||
# The tar files and binary deltas are finally compressed with bzip2,
|
||||
# and optionally with lzip and xz too, if the compressors are
|
||||
# available.
|
||||
|
||||
# At the end, the script attempts to generate a digital signature for
|
||||
# the newly-created tarball. This is the last thing the script does,
|
||||
# so interrupting it at that point to skip the signing won't fail to
|
||||
# do anything else.
|
||||
|
||||
# It is safe to interrupt the script at any other point. When it gets
|
||||
# a ^C (other than during signing), it starts cleaning up all of its
|
||||
# temporary and output files. If you insist, it may leave junk
|
||||
# behind, and then it will refuse to run again before you clean it up
|
||||
# by hand. It takes extra care to avoid overwriting useful files.
|
||||
|
||||
# If deblob-$mver finds any unexpected situation, it will error out,
|
||||
# and then deblob-main will quit. Pass --force to deblob-main, before
|
||||
# any other argument, for deblob-main to ignore any such situations.
|
||||
|
||||
case $1 in
|
||||
--force) force=--force; shift;;
|
||||
*) force=;;
|
||||
esac
|
||||
|
||||
# We don't want e.g. diff output translations to affect us.
|
||||
LC_ALL=C; export LC_ALL
|
||||
LANGUAGE=C; export LANGUAGE
|
||||
|
||||
mver=$1 extra=$2 sver=$3
|
||||
kver=$mver$sver gnu=gnu$extra
|
||||
deblob= dir=`echo "$0" | sed 's,[^/]*$,,;s,^$,.,;s,/*$,,'`
|
||||
|
||||
if test -f linux-$kver.tar; then
|
||||
zext=tar zcmd=
|
||||
elif test -f linux-$kver.tar.bz2; then
|
||||
zext=tar.bz2 zcmd=bunzip2
|
||||
elif test -f linux-$kver.tar.xz; then
|
||||
zext=tar.xz zcmd=unxz
|
||||
elif test -f linux-$kver.tar.lz; then
|
||||
zext=tar.lz zcmd="lzip -d"
|
||||
elif test -f linux-$kver.tar.gz; then
|
||||
zext=tar.gz zcmd=gunzip
|
||||
elif test -f linux-$kver.tgz; then
|
||||
zext=tgz zcmd=gunzip
|
||||
else
|
||||
echo linux-$kver.tar not found, tried .bz2, .xz, .lz, .gz and .tgz too >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test -f deblob-$mver; then
|
||||
deblob=deblob-$mver
|
||||
elif test -f deblob; then
|
||||
deblob=deblob
|
||||
elif test -f $dir/deblob-$mver; then
|
||||
cp $dir/deblob-$mver deblob
|
||||
deblob=deblob
|
||||
else
|
||||
echo deblob does not exist >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
x1="kver=$mver extra=$extra"
|
||||
x2=`grep "^kver=[^ ]* extra=" $deblob | sed 's, *#.*,,'`
|
||||
if test "$x1" = "$x2"; then
|
||||
:
|
||||
else
|
||||
echo deblob script does not match command-line arguments >&2
|
||||
echo expected: $x1 >&2
|
||||
echo found : $x2 >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cleanup=
|
||||
|
||||
for f in \
|
||||
linux-libre-$kver-$gnu.tar.bz2 \
|
||||
linux-libre-$kver-$gnu.tar.bz2.asc \
|
||||
linux-libre-$kver-$gnu.tar.bz2.sign \
|
||||
linux-libre-$kver-$gnu.tar.xz \
|
||||
linux-libre-$kver-$gnu.tar.xz.asc \
|
||||
linux-libre-$kver-$gnu.tar.xz.sign \
|
||||
linux-libre-$kver-$gnu.tar.lz \
|
||||
linux-libre-$kver-$gnu.tar.lz.asc \
|
||||
linux-libre-$kver-$gnu.tar.lz.sign \
|
||||
linux-libre-$kver-$gnu.tar \
|
||||
linux-libre-$kver-$gnu.tar.asc \
|
||||
linux-libre-$kver-$gnu.tar.sign \
|
||||
linux-libre-$kver-$gnu.patch \
|
||||
linux-libre-$kver-$gnu.log \
|
||||
linux-libre-$kver-$gnu.vcdiff \
|
||||
linux-libre-$kver-$gnu.vcdiff.bz2 \
|
||||
linux-libre-$kver-$gnu.vcdiff.bz2.asc \
|
||||
linux-libre-$kver-$gnu.vcdiff.bz2.sign \
|
||||
linux-libre-$kver-$gnu.vcdiff.xz \
|
||||
linux-libre-$kver-$gnu.vcdiff.xz.asc \
|
||||
linux-libre-$kver-$gnu.vcdiff.xz.sign \
|
||||
linux-libre-$kver-$gnu.vcdiff.lz \
|
||||
linux-libre-$kver-$gnu.vcdiff.lz.asc \
|
||||
linux-libre-$kver-$gnu.vcdiff.lz.sign \
|
||||
linux-libre-$kver-$gnu.xdelta \
|
||||
linux-libre-$kver-$gnu.xdelta.bz2 \
|
||||
linux-libre-$kver-$gnu.xdelta.bz2.asc \
|
||||
linux-libre-$kver-$gnu.xdelta.bz2.sign \
|
||||
linux-libre-$kver-$gnu.xdelta.xz \
|
||||
linux-libre-$kver-$gnu.xdelta.xz.asc \
|
||||
linux-libre-$kver-$gnu.xdelta.xz.sign \
|
||||
linux-libre-$kver-$gnu.xdelta.lz \
|
||||
linux-libre-$kver-$gnu.xdelta.lz.asc \
|
||||
linux-libre-$kver-$gnu.xdelta.lz.sign \
|
||||
; do
|
||||
if test -f $f; then
|
||||
echo $f already exists >&2
|
||||
exit 1
|
||||
fi
|
||||
cleanup="$cleanup $f"
|
||||
done
|
||||
|
||||
for d in \
|
||||
linux-$kver \
|
||||
linux-libre-$kver-$gnu \
|
||||
orig-linux-$kver \
|
||||
; do
|
||||
if test -d $d; then
|
||||
echo $d already exists >&2
|
||||
exit 1
|
||||
fi
|
||||
cleanup="$cleanup $d"
|
||||
done
|
||||
|
||||
if test -f $dir/deblob-$kver; then
|
||||
if cmp $dir/deblob-$kver $deblob; then
|
||||
:
|
||||
else
|
||||
echo $dir/deblob-$kver and $deblob are different >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if test ! -f deblob-check; then
|
||||
if test -f $dir/deblob-check; then
|
||||
cp $dir/deblob-check deblob-check
|
||||
fi
|
||||
else
|
||||
if test -f $dir/deblob-check; then
|
||||
if cmp $dir/deblob-check deblob-check; then
|
||||
:
|
||||
else
|
||||
echo $dir/deblob-check and deblob-check are different >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
trap 'status=$?; echo cleaning up...; rm -rf $cleanup; (exit $status); exit' 0 1 2 15
|
||||
|
||||
set -e
|
||||
|
||||
if test -n "$zcmd"; then
|
||||
echo Uncompressing linux-$kver.$zext into linux-$kver.tar
|
||||
rm -rf linux-$kver.tar
|
||||
cleanup="$cleanup linux-$kver.tar"
|
||||
$zcmd < linux-$kver.$zext > linux-$kver.tar
|
||||
fi
|
||||
|
||||
echo Extracting linux-$kver.tar into linux-$kver
|
||||
rm -rf linux-$kver
|
||||
tar -xf linux-$kver.tar
|
||||
rm -rf linux-libre-$kver-$gnu linux-libre-$kver-$gnu.tar
|
||||
|
||||
echo Copying linux-$kver to linux-libre-$kver-$gnu
|
||||
cp linux-$kver.tar linux-libre-$kver-$gnu.tar
|
||||
cp -lR linux-$kver/. linux-libre-$kver-$gnu
|
||||
|
||||
rm -f linux-libre-$kver-$gnu.log linux-libre-$kver-$gnu.log.tmp
|
||||
echo Deblobbing within linux-libre-$kver-$gnu, saving output to linux-libre-$kver-$gnu.log
|
||||
# We can't just pipe deblob into tee, for then we fail to detect
|
||||
# error conditions. Use file renaming to tell whether we succeeded.
|
||||
if (cd linux-libre-$kver-$gnu && /bin/sh ../$deblob $force) 2>&1; then
|
||||
mv linux-libre-$kver-$gnu.log.tmp linux-libre-$kver-$gnu.log
|
||||
fi | tee linux-libre-$kver-$gnu.log.tmp
|
||||
if test ! -f linux-libre-$kver-$gnu.log; then
|
||||
mv linux-libre-$kver-$gnu.log.tmp linux-libre-$kver-$gnu.log
|
||||
echo $deblob failed, aborting >&2
|
||||
exit 1
|
||||
fi
|
||||
rm -f linux-libre-$kver-$gnu.patch
|
||||
|
||||
# Do not copy these scripts for now, deblob-check regards itself as a blob.
|
||||
# cp -p $0 $deblob deblob-check linux-libre-$kver-$gnu
|
||||
|
||||
echo Generating linux-libre-$kver-$gnu.patch
|
||||
diff -druN linux-$kver linux-libre-$kver-$gnu > linux-libre-$kver-$gnu.patch || :
|
||||
|
||||
echo Removing removed or modified files from linux-libre-$kver-$gnu.tar
|
||||
diff -rq linux-$kver linux-libre-$kver-$gnu |
|
||||
sed -n "
|
||||
s,^Only in \\(linux-$kver\\(/.*\\)\\?\\): \\(.*\\),\1/\3,p;
|
||||
s,^Files \\(linux-$kver\\)/\\(.*\\) and linux-libre-$kver-$gnu/\\2 differ,\\1/\\2,p;
|
||||
" |
|
||||
xargs tar --delete -f linux-libre-$kver-$gnu.tar
|
||||
|
||||
echo Adding modified or added files to linux-libre-$kver-$gnu.tar
|
||||
rm -rf orig-linux-$kver
|
||||
mv linux-$kver orig-linux-$kver
|
||||
mv linux-libre-$kver-$gnu linux-$kver
|
||||
diff -rq orig-linux-$kver linux-$kver |
|
||||
sed -n "
|
||||
s,^Files orig-\\(linux-$kver/.*\\) and \\1 differ,\\1,p;
|
||||
s,^Only in \\(linux-$kver\\(/.*\\)\\?\\): \\(.*\\),\\1/\\3,p;
|
||||
" |
|
||||
xargs tar --append -f linux-libre-$kver-$gnu.tar
|
||||
|
||||
echo Wiping out extracted trees
|
||||
rm -rf linux-$kver orig-linux-$kver
|
||||
|
||||
echo Creating vcdiff between linux-$kver.tar and linux-libre-$kver-$gnu.tar
|
||||
xdelta3 -e -9 -S djw -s linux-$kver.tar linux-libre-$kver-$gnu.tar linux-libre-$kver-$gnu.vcdiff || : # don't fail if xdelta3 is not present
|
||||
|
||||
echo Creating xdelta between linux-$kver.tar and linux-libre-$kver-$gnu.tar
|
||||
xdelta delta -0 linux-$kver.tar linux-libre-$kver-$gnu.tar linux-libre-$kver-$gnu.xdelta || : # xdelta returns nonzero on success
|
||||
|
||||
cleanup="linux-libre-$kver-$gnu.tar linux-libre-$kver-$gnu.xdelta"
|
||||
|
||||
echo Compressing binary deltas and linux-libre-$kver-$gnu.tar
|
||||
rm -f linux-$kver.tar
|
||||
if test -f linux-libre-$kver-$gnu.xdelta; then
|
||||
bzip2 -k9 linux-libre-$kver-$gnu.xdelta
|
||||
xz -k9 linux-libre-$kver-$gnu.xdelta || :
|
||||
lzip -k9s64MiB linux-libre-$kver-$gnu.xdelta || :
|
||||
fi
|
||||
bzip2 -k9 linux-libre-$kver-$gnu.tar
|
||||
xz -k9 linux-libre-$kver-$gnu.tar || :
|
||||
lzip -k9s64MiB linux-libre-$kver-$gnu.tar || :
|
||||
|
||||
echo Done except for signing, feel free to interrupt
|
||||
for f in \
|
||||
linux-libre-$kver-$gnu.tar \
|
||||
linux-libre-$kver-$gnu.tar.bz2 \
|
||||
linux-libre-$kver-$gnu.tar.xz \
|
||||
linux-libre-$kver-$gnu.tar.lz \
|
||||
linux-libre-$kver-$gnu.vcdiff \
|
||||
linux-libre-$kver-$gnu.xdelta \
|
||||
linux-libre-$kver-$gnu.xdelta.bz2 \
|
||||
linux-libre-$kver-$gnu.xdelta.xz \
|
||||
linux-libre-$kver-$gnu.xdelta.lz \
|
||||
; do
|
||||
if test -f $f; then
|
||||
gpg -a --detach-sign $f
|
||||
mv $f.asc $f.sign
|
||||
fi
|
||||
done
|
||||
|
||||
rm -f $cleanup
|
||||
cleanup=
|
||||
trap 'status=$?; (exit $status); exit' 0 1 2 15
|
||||
|
||||
echo All set, please review linux-libre-$kver-$gnu.patch
|
||||
|
||||
exit 0
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,990 +0,0 @@
|
|||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
|
||||
index c0a8062..65c1170 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
|
||||
@@ -734,7 +734,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
|
||||
|
||||
err = amdgpu_ucode_validate(adev->pm.fw);
|
||||
if (err) {
|
||||
- DRM_ERROR("Failed to load firmware \"%s\"", fw_name);
|
||||
+ DRM_ERROR("Failed to load firmware", fw_name);
|
||||
release_firmware(adev->pm.fw);
|
||||
adev->pm.fw = NULL;
|
||||
return err;
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
|
||||
index 2ca09f1..15caf24 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
|
||||
@@ -173,7 +173,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
|
||||
|
||||
r = request_firmware(&adev->uvd.fw, fw_name, adev->dev);
|
||||
if (r) {
|
||||
- dev_err(adev->dev, "amdgpu_uvd: Can't load firmware \"%s\"\n",
|
||||
+ dev_err(adev->dev, "amdgpu_uvd: Can't load firmware\n",
|
||||
fw_name);
|
||||
return r;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
|
||||
index b692ad4..1ca7f9f 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
|
||||
@@ -140,7 +140,7 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
|
||||
|
||||
r = request_firmware(&adev->vce.fw, fw_name, adev->dev);
|
||||
if (r) {
|
||||
- dev_err(adev->dev, "amdgpu_vce: Can't load firmware \"%s\"\n",
|
||||
+ dev_err(adev->dev, "amdgpu_vce: Can't load firmware\n",
|
||||
fw_name);
|
||||
return r;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
|
||||
index cb508a2..ca4453b 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
|
||||
@@ -5848,7 +5848,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev)
|
||||
|
||||
out:
|
||||
if (err) {
|
||||
- pr_err("cik_smc: Failed to load firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("cik_smc: Failed to load firmware\n", fw_name);
|
||||
release_firmware(adev->pm.fw);
|
||||
adev->pm.fw = NULL;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
|
||||
index c216e16..4a399cc 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
|
||||
@@ -142,7 +142,7 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)
|
||||
}
|
||||
out:
|
||||
if (err) {
|
||||
- pr_err("cik_sdma: Failed to load firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("cik_sdma: Failed to load firmware\n", fw_name);
|
||||
for (i = 0; i < adev->sdma.num_instances; i++) {
|
||||
release_firmware(adev->sdma.instance[i].fw);
|
||||
adev->sdma.instance[i].fw = NULL;
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
|
||||
index 37b45e4..b7fa33c 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
|
||||
@@ -973,7 +973,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
|
||||
|
||||
out:
|
||||
if (err) {
|
||||
- pr_err("gfx7: Failed to load firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("gfx7: Failed to load firmware\n", fw_name);
|
||||
release_firmware(adev->gfx.pfp_fw);
|
||||
adev->gfx.pfp_fw = NULL;
|
||||
release_firmware(adev->gfx.me_fw);
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
|
||||
index aa5a50f..c7acffb 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
|
||||
@@ -1106,7 +1106,7 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
|
||||
out:
|
||||
if (err) {
|
||||
dev_err(adev->dev,
|
||||
- "gfx8: Failed to load firmware \"%s\"\n",
|
||||
+ "gfx8: Failed to load firmware\n",
|
||||
fw_name);
|
||||
release_firmware(adev->gfx.pfp_fw);
|
||||
adev->gfx.pfp_fw = NULL;
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
|
||||
index 7e9ea53..6815fb5 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
|
||||
@@ -163,7 +163,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
|
||||
|
||||
out:
|
||||
if (err) {
|
||||
- pr_err("cik_mc: Failed to load firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("cik_mc: Failed to load firmware\n", fw_name);
|
||||
release_firmware(adev->mc.fw);
|
||||
adev->mc.fw = NULL;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
|
||||
index cc9f880..67359b3 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
|
||||
@@ -247,7 +247,7 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev)
|
||||
|
||||
out:
|
||||
if (err) {
|
||||
- pr_err("mc: Failed to load firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("mc: Failed to load firmware\n", fw_name);
|
||||
release_firmware(adev->mc.fw);
|
||||
adev->mc.fw = NULL;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
|
||||
index f2d0710..bf0edd5 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
|
||||
@@ -170,7 +170,7 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev)
|
||||
|
||||
out:
|
||||
if (err) {
|
||||
- pr_err("sdma_v2_4: Failed to load firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("sdma_v2_4: Failed to load firmware\n", fw_name);
|
||||
for (i = 0; i < adev->sdma.num_instances; i++) {
|
||||
release_firmware(adev->sdma.instance[i].fw);
|
||||
adev->sdma.instance[i].fw = NULL;
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
|
||||
index 1d766ae..1103992 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
|
||||
@@ -321,7 +321,7 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)
|
||||
}
|
||||
out:
|
||||
if (err) {
|
||||
- pr_err("sdma_v3_0: Failed to load firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("sdma_v3_0: Failed to load firmware\n", fw_name);
|
||||
for (i = 0; i < adev->sdma.num_instances; i++) {
|
||||
release_firmware(adev->sdma.instance[i].fw);
|
||||
adev->sdma.instance[i].fw = NULL;
|
||||
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
|
||||
index 1c0495a..0085e8e 100644
|
||||
--- a/drivers/gpu/drm/drm_edid_load.c
|
||||
+++ b/drivers/gpu/drm/drm_edid_load.c
|
||||
@@ -188,8 +188,8 @@ static void *edid_load(struct drm_connector *connector, const char *name,
|
||||
err = request_firmware(&fw, name, &pdev->dev);
|
||||
platform_device_unregister(pdev);
|
||||
if (err) {
|
||||
- DRM_ERROR("Requesting EDID firmware \"%s\" failed (err=%d)\n",
|
||||
- name, err);
|
||||
+ DRM_ERROR("Requesting EDID firmware failed (err=%d)\n",
|
||||
+ err);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
|
||||
index 06bdb67..7eca739 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
|
||||
@@ -109,7 +109,7 @@ nvkm_xtensa_init(struct nvkm_engine *engine)
|
||||
|
||||
ret = request_firmware(&fw, name, device->dev);
|
||||
if (ret) {
|
||||
- nvkm_warn(subdev, "unable to load firmware %s\n", name);
|
||||
+ nvkm_warn(subdev, "unable to load firmware\n", name);
|
||||
return ret;
|
||||
}
|
||||
|
||||
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
|
||||
index c9890af..cfe11ce 100644
|
||||
--- a/drivers/gpu/drm/r128/r128_cce.c
|
||||
+++ b/drivers/gpu/drm/r128/r128_cce.c
|
||||
@@ -155,13 +155,13 @@ static int r128_cce_load_microcode(drm_r128_private_t *dev_priv)
|
||||
rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev);
|
||||
platform_device_unregister(pdev);
|
||||
if (rc) {
|
||||
- pr_err("r128_cce: Failed to load firmware \"%s\"\n",
|
||||
+ pr_err("r128_cce: Failed to load firmware\n",
|
||||
FIRMWARE_NAME);
|
||||
return rc;
|
||||
}
|
||||
|
||||
if (fw->size != 256 * 8) {
|
||||
- pr_err("r128_cce: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("r128_cce: Bogus length %zu in firmware\n",
|
||||
fw->size, FIRMWARE_NAME);
|
||||
rc = -EINVAL;
|
||||
goto out_release;
|
||||
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
|
||||
index 3cb6c55..5bf3ff6 100644
|
||||
--- a/drivers/gpu/drm/radeon/cik.c
|
||||
+++ b/drivers/gpu/drm/radeon/cik.c
|
||||
@@ -2072,7 +2072,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->pfp_fw->size != pfp_req_size) {
|
||||
- pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("cik_cp: Bogus length %zu in firmware\n",
|
||||
rdev->pfp_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
goto out;
|
||||
@@ -2080,7 +2080,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->pfp_fw);
|
||||
if (err) {
|
||||
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("cik_fw: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -2096,14 +2096,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->me_fw->size != me_req_size) {
|
||||
- pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("cik_cp: Bogus length %zu in firmware\n",
|
||||
rdev->me_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->me_fw);
|
||||
if (err) {
|
||||
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("cik_fw: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -2119,14 +2119,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->ce_fw->size != ce_req_size) {
|
||||
- pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("cik_cp: Bogus length %zu in firmware\n",
|
||||
rdev->ce_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->ce_fw);
|
||||
if (err) {
|
||||
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("cik_fw: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -2142,14 +2142,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->mec_fw->size != mec_req_size) {
|
||||
- pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("cik_cp: Bogus length %zu in firmware\n",
|
||||
rdev->mec_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->mec_fw);
|
||||
if (err) {
|
||||
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("cik_fw: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -2180,14 +2180,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->rlc_fw->size != rlc_req_size) {
|
||||
- pr_err("cik_rlc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("cik_rlc: Bogus length %zu in firmware\n",
|
||||
rdev->rlc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->rlc_fw);
|
||||
if (err) {
|
||||
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("cik_fw: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -2203,14 +2203,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->sdma_fw->size != sdma_req_size) {
|
||||
- pr_err("cik_sdma: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("cik_sdma: Bogus length %zu in firmware\n",
|
||||
rdev->sdma_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->sdma_fw);
|
||||
if (err) {
|
||||
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("cik_fw: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -2233,7 +2233,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
}
|
||||
if ((rdev->mc_fw->size != mc_req_size) &&
|
||||
(rdev->mc_fw->size != mc2_req_size)){
|
||||
- pr_err("cik_mc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("cik_mc: Bogus length %zu in firmware\n",
|
||||
rdev->mc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
@@ -2241,7 +2241,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->mc_fw);
|
||||
if (err) {
|
||||
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("cik_fw: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -2258,20 +2258,20 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
|
||||
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
|
||||
if (err) {
|
||||
- pr_err("smc: error loading firmware \"%s\"\n",
|
||||
+ pr_err("smc: error loading firmware\n",
|
||||
fw_name);
|
||||
release_firmware(rdev->smc_fw);
|
||||
rdev->smc_fw = NULL;
|
||||
err = 0;
|
||||
} else if (rdev->smc_fw->size != smc_req_size) {
|
||||
- pr_err("cik_smc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("cik_smc: Bogus length %zu in firmware\n",
|
||||
rdev->smc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->smc_fw);
|
||||
if (err) {
|
||||
- pr_err("cik_fw: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("cik_fw: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -2292,7 +2292,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
|
||||
out:
|
||||
if (err) {
|
||||
if (err != -EINVAL)
|
||||
- pr_err("cik_cp: Failed to load firmware \"%s\"\n",
|
||||
+ pr_err("cik_cp: Failed to load firmware\n",
|
||||
fw_name);
|
||||
release_firmware(rdev->pfp_fw);
|
||||
rdev->pfp_fw = NULL;
|
||||
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
|
||||
index 9eccd0c..3b9b7d6 100644
|
||||
--- a/drivers/gpu/drm/radeon/ni.c
|
||||
+++ b/drivers/gpu/drm/radeon/ni.c
|
||||
@@ -774,7 +774,7 @@ int ni_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->pfp_fw->size != pfp_req_size) {
|
||||
- pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("ni_cp: Bogus length %zu in firmware\n",
|
||||
rdev->pfp_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
goto out;
|
||||
@@ -785,7 +785,7 @@ int ni_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->me_fw->size != me_req_size) {
|
||||
- pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("ni_cp: Bogus length %zu in firmware\n",
|
||||
rdev->me_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
@@ -795,7 +795,7 @@ int ni_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->rlc_fw->size != rlc_req_size) {
|
||||
- pr_err("ni_rlc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("ni_rlc: Bogus length %zu in firmware\n",
|
||||
rdev->rlc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
@@ -807,7 +807,7 @@ int ni_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->mc_fw->size != mc_req_size) {
|
||||
- pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("ni_mc: Bogus length %zu in firmware\n",
|
||||
rdev->mc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
@@ -817,12 +817,12 @@ int ni_init_microcode(struct radeon_device *rdev)
|
||||
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
|
||||
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
|
||||
if (err) {
|
||||
- pr_err("smc: error loading firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("smc: error loading firmware\n", fw_name);
|
||||
release_firmware(rdev->smc_fw);
|
||||
rdev->smc_fw = NULL;
|
||||
err = 0;
|
||||
} else if (rdev->smc_fw->size != smc_req_size) {
|
||||
- pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("ni_mc: Bogus length %zu in firmware\n",
|
||||
rdev->mc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
@@ -831,7 +831,7 @@ int ni_init_microcode(struct radeon_device *rdev)
|
||||
out:
|
||||
if (err) {
|
||||
if (err != -EINVAL)
|
||||
- pr_err("ni_cp: Failed to load firmware \"%s\"\n",
|
||||
+ pr_err("ni_cp: Failed to load firmware\n",
|
||||
fw_name);
|
||||
release_firmware(rdev->pfp_fw);
|
||||
rdev->pfp_fw = NULL;
|
||||
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
|
||||
index c31e660..658eaf8 100644
|
||||
--- a/drivers/gpu/drm/radeon/r100.c
|
||||
+++ b/drivers/gpu/drm/radeon/r100.c
|
||||
@@ -1042,9 +1042,9 @@ static int r100_cp_init_microcode(struct radeon_device *rdev)
|
||||
|
||||
err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);
|
||||
if (err) {
|
||||
- pr_err("radeon_cp: Failed to load firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("radeon_cp: Failed to load firmware\n", fw_name);
|
||||
} else if (rdev->me_fw->size % 8) {
|
||||
- pr_err("radeon_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("radeon_cp: Bogus length %zu in firmware\n",
|
||||
rdev->me_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
release_firmware(rdev->me_fw);
|
||||
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
|
||||
index e06e2d8..9004945 100644
|
||||
--- a/drivers/gpu/drm/radeon/r600.c
|
||||
+++ b/drivers/gpu/drm/radeon/r600.c
|
||||
@@ -2550,7 +2550,7 @@ int r600_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->pfp_fw->size != pfp_req_size) {
|
||||
- pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("r600_cp: Bogus length %zu in firmware\n",
|
||||
rdev->pfp_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
goto out;
|
||||
@@ -2561,7 +2561,7 @@ int r600_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->me_fw->size != me_req_size) {
|
||||
- pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("r600_cp: Bogus length %zu in firmware\n",
|
||||
rdev->me_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
@@ -2571,7 +2571,7 @@ int r600_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->rlc_fw->size != rlc_req_size) {
|
||||
- pr_err("r600_rlc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("r600_rlc: Bogus length %zu in firmware\n",
|
||||
rdev->rlc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
@@ -2580,12 +2580,12 @@ int r600_init_microcode(struct radeon_device *rdev)
|
||||
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", smc_chip_name);
|
||||
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
|
||||
if (err) {
|
||||
- pr_err("smc: error loading firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("smc: error loading firmware\n", fw_name);
|
||||
release_firmware(rdev->smc_fw);
|
||||
rdev->smc_fw = NULL;
|
||||
err = 0;
|
||||
} else if (rdev->smc_fw->size != smc_req_size) {
|
||||
- pr_err("smc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("smc: Bogus length %zu in firmware\n",
|
||||
rdev->smc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
@@ -2594,7 +2594,7 @@ int r600_init_microcode(struct radeon_device *rdev)
|
||||
out:
|
||||
if (err) {
|
||||
if (err != -EINVAL)
|
||||
- pr_err("r600_cp: Failed to load firmware \"%s\"\n",
|
||||
+ pr_err("r600_cp: Failed to load firmware\n",
|
||||
fw_name);
|
||||
release_firmware(rdev->pfp_fw);
|
||||
rdev->pfp_fw = NULL;
|
||||
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
|
||||
index d34d1cf..10e859c 100644
|
||||
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
|
||||
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
|
||||
@@ -140,7 +140,7 @@ int radeon_uvd_init(struct radeon_device *rdev)
|
||||
/* Let's try to load the newer firmware first */
|
||||
r = request_firmware(&rdev->uvd_fw, fw_name, rdev->dev);
|
||||
if (r) {
|
||||
- dev_err(rdev->dev, "radeon_uvd: Can't load firmware \"%s\"\n",
|
||||
+ dev_err(rdev->dev, "radeon_uvd: Can't load firmware\n",
|
||||
fw_name);
|
||||
} else {
|
||||
struct common_firmware_header *hdr = (void *)rdev->uvd_fw->data;
|
||||
@@ -175,7 +175,7 @@ int radeon_uvd_init(struct radeon_device *rdev)
|
||||
if (!fw_name || r) {
|
||||
r = request_firmware(&rdev->uvd_fw, legacy_fw_name, rdev->dev);
|
||||
if (r) {
|
||||
- dev_err(rdev->dev, "radeon_uvd: Can't load firmware \"%s\"\n",
|
||||
+ dev_err(rdev->dev, "radeon_uvd: Can't load firmware\n",
|
||||
legacy_fw_name);
|
||||
return r;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c
|
||||
index c1c619f..744612d 100644
|
||||
--- a/drivers/gpu/drm/radeon/radeon_vce.c
|
||||
+++ b/drivers/gpu/drm/radeon/radeon_vce.c
|
||||
@@ -87,7 +87,7 @@ int radeon_vce_init(struct radeon_device *rdev)
|
||||
|
||||
r = request_firmware(&rdev->vce_fw, fw_name, rdev->dev);
|
||||
if (r) {
|
||||
- dev_err(rdev->dev, "radeon_vce: Can't load firmware \"%s\"\n",
|
||||
+ dev_err(rdev->dev, "radeon_vce: Can't load firmware\n",
|
||||
fw_name);
|
||||
return r;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
|
||||
index 1907c95..7ff65cc 100644
|
||||
--- a/drivers/gpu/drm/radeon/si.c
|
||||
+++ b/drivers/gpu/drm/radeon/si.c
|
||||
@@ -1786,7 +1786,7 @@ static int si_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->pfp_fw->size != pfp_req_size) {
|
||||
- pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("si_cp: Bogus length %zu in firmware\n",
|
||||
rdev->pfp_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
goto out;
|
||||
@@ -1794,7 +1794,7 @@ static int si_init_microcode(struct radeon_device *rdev)
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->pfp_fw);
|
||||
if (err) {
|
||||
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("si_cp: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -1810,14 +1810,14 @@ static int si_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->me_fw->size != me_req_size) {
|
||||
- pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("si_cp: Bogus length %zu in firmware\n",
|
||||
rdev->me_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->me_fw);
|
||||
if (err) {
|
||||
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("si_cp: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -1833,14 +1833,14 @@ static int si_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->ce_fw->size != ce_req_size) {
|
||||
- pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("si_cp: Bogus length %zu in firmware\n",
|
||||
rdev->ce_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->ce_fw);
|
||||
if (err) {
|
||||
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("si_cp: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -1856,14 +1856,14 @@ static int si_init_microcode(struct radeon_device *rdev)
|
||||
if (err)
|
||||
goto out;
|
||||
if (rdev->rlc_fw->size != rlc_req_size) {
|
||||
- pr_err("si_rlc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("si_rlc: Bogus length %zu in firmware\n",
|
||||
rdev->rlc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->rlc_fw);
|
||||
if (err) {
|
||||
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("si_cp: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -1887,7 +1887,7 @@ static int si_init_microcode(struct radeon_device *rdev)
|
||||
}
|
||||
if ((rdev->mc_fw->size != mc_req_size) &&
|
||||
(rdev->mc_fw->size != mc2_req_size)) {
|
||||
- pr_err("si_mc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("si_mc: Bogus length %zu in firmware\n",
|
||||
rdev->mc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
@@ -1895,7 +1895,7 @@ static int si_init_microcode(struct radeon_device *rdev)
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->mc_fw);
|
||||
if (err) {
|
||||
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("si_cp: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -1914,19 +1914,19 @@ static int si_init_microcode(struct radeon_device *rdev)
|
||||
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
|
||||
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
|
||||
if (err) {
|
||||
- pr_err("smc: error loading firmware \"%s\"\n", fw_name);
|
||||
+ pr_err("smc: error loading firmware\n", fw_name);
|
||||
release_firmware(rdev->smc_fw);
|
||||
rdev->smc_fw = NULL;
|
||||
err = 0;
|
||||
} else if (rdev->smc_fw->size != smc_req_size) {
|
||||
- pr_err("si_smc: Bogus length %zu in firmware \"%s\"\n",
|
||||
+ pr_err("si_smc: Bogus length %zu in firmware\n",
|
||||
rdev->smc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
} else {
|
||||
err = radeon_ucode_validate(rdev->smc_fw);
|
||||
if (err) {
|
||||
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
|
||||
+ pr_err("si_cp: validation failed for firmware\n",
|
||||
fw_name);
|
||||
goto out;
|
||||
} else {
|
||||
@@ -1945,7 +1945,7 @@ static int si_init_microcode(struct radeon_device *rdev)
|
||||
out:
|
||||
if (err) {
|
||||
if (err != -EINVAL)
|
||||
- pr_err("si_cp: Failed to load firmware \"%s\"\n",
|
||||
+ pr_err("si_cp: Failed to load firmware\n",
|
||||
fw_name);
|
||||
release_firmware(rdev->pfp_fw);
|
||||
rdev->pfp_fw = NULL;
|
||||
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
|
||||
index 9368abd..fa4de6a 100644
|
||||
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
|
||||
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
|
||||
@@ -3417,12 +3417,12 @@ static int ipw_get_fw(struct ipw_priv *priv,
|
||||
/* ask firmware_class module to get the boot firmware off disk */
|
||||
rc = request_firmware(raw, name, &priv->pci_dev->dev);
|
||||
if (rc < 0) {
|
||||
- IPW_ERROR("%s request_firmware failed: Reason %d\n", name, rc);
|
||||
+ IPW_ERROR("request_firmware failed: Reason %d\n", rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
if ((*raw)->size < sizeof(*fw)) {
|
||||
- IPW_ERROR("%s is too small (%zd)\n", name, (*raw)->size);
|
||||
+ IPW_ERROR("Firmware file is too small (%zd)\n", (*raw)->size);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -3430,13 +3430,12 @@ static int ipw_get_fw(struct ipw_priv *priv,
|
||||
|
||||
if ((*raw)->size < sizeof(*fw) + le32_to_cpu(fw->boot_size) +
|
||||
le32_to_cpu(fw->ucode_size) + le32_to_cpu(fw->fw_size)) {
|
||||
- IPW_ERROR("%s is too small or corrupt (%zd)\n",
|
||||
- name, (*raw)->size);
|
||||
+ IPW_ERROR("Firmware file is too small or corrupt (%zd)\n",
|
||||
+ (*raw)->size);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- IPW_DEBUG_INFO("Read firmware '%s' image v%d.%d (%zd bytes)\n",
|
||||
- name,
|
||||
+ IPW_DEBUG_INFO("Read firmware image v%d.%d (%zd bytes)\n",
|
||||
le32_to_cpu(fw->ver) >> 16,
|
||||
le32_to_cpu(fw->ver) & 0xff,
|
||||
(*raw)->size - sizeof(*fw));
|
||||
@@ -3569,7 +3568,7 @@ static int ipw_load(struct ipw_priv *priv)
|
||||
/* DMA the initial boot firmware into the device */
|
||||
rc = ipw_load_firmware(priv, boot_img, le32_to_cpu(fw->boot_size));
|
||||
if (rc < 0) {
|
||||
- IPW_ERROR("Unable to load boot firmware: %d\n", rc);
|
||||
+ IPW_ERROR("Unable to load boot firmware\n", rc);
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -3601,7 +3600,7 @@ static int ipw_load(struct ipw_priv *priv)
|
||||
/* DMA bss firmware into the device */
|
||||
rc = ipw_load_firmware(priv, fw_img, le32_to_cpu(fw->fw_size));
|
||||
if (rc < 0) {
|
||||
- IPW_ERROR("Unable to load firmware: %d\n", rc);
|
||||
+ IPW_ERROR("Unable to load firmware\n", rc);
|
||||
goto error;
|
||||
}
|
||||
#ifdef CONFIG_PM
|
||||
@@ -11213,7 +11212,7 @@ static int ipw_up(struct ipw_priv *priv)
|
||||
* Also start the clocks. */
|
||||
rc = ipw_load(priv);
|
||||
if (rc) {
|
||||
- IPW_ERROR("Unable to load firmware: %d\n", rc);
|
||||
+ IPW_ERROR("Unable to load firmware\n", rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
|
||||
index 38bf403..a7934a6 100644
|
||||
--- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c
|
||||
+++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
|
||||
@@ -1861,7 +1861,7 @@ il3945_read_ucode(struct il_priv *il)
|
||||
sprintf(buf, "%s%u%s", name_pre, idx, ".ucode");
|
||||
ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev);
|
||||
if (ret < 0) {
|
||||
- IL_ERR("%s firmware file req failed: %d\n", buf, ret);
|
||||
+ IL_ERR("Firmware file req failed\n", buf, ret);
|
||||
if (ret == -ENOENT)
|
||||
continue;
|
||||
else
|
||||
@@ -1870,7 +1870,7 @@ il3945_read_ucode(struct il_priv *il)
|
||||
if (idx < api_max)
|
||||
IL_ERR("Loaded firmware %s, "
|
||||
"which is deprecated. "
|
||||
- " Please use API v%u instead.\n", buf,
|
||||
+ "\n", buf,
|
||||
api_max);
|
||||
D_INFO("Got firmware '%s' file "
|
||||
"(%zd bytes) from disk\n", buf, ucode_raw->size);
|
||||
@@ -1906,16 +1906,14 @@ il3945_read_ucode(struct il_priv *il)
|
||||
|
||||
if (api_ver < api_min || api_ver > api_max) {
|
||||
IL_ERR("Driver unable to support your firmware API. "
|
||||
- "Driver supports v%u, firmware is v%u.\n", api_max,
|
||||
+ "\n", api_max,
|
||||
api_ver);
|
||||
il->ucode_ver = 0;
|
||||
ret = -EINVAL;
|
||||
goto err_release;
|
||||
}
|
||||
if (api_ver != api_max)
|
||||
- IL_ERR("Firmware has old API version. Expected %u, "
|
||||
- "got %u. New firmware can be obtained "
|
||||
- "from http://www.intellinuxwireless.org.\n", api_max,
|
||||
+ IL_ERR("Firmware has old API version\n", api_max,
|
||||
api_ver);
|
||||
|
||||
IL_INFO("loaded firmware version %u.%u.%u.%u\n",
|
||||
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
|
||||
index 5b51fba..b16ab69 100644
|
||||
--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c
|
||||
+++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
|
||||
@@ -4708,7 +4708,7 @@ il4965_request_firmware(struct il_priv *il, bool first)
|
||||
|
||||
sprintf(il->firmware_name, "%s%s%s", name_pre, tag, ".ucode");
|
||||
|
||||
- D_INFO("attempting to load firmware '%s'\n", il->firmware_name);
|
||||
+ D_INFO("attempting to load firmware\n", il->firmware_name);
|
||||
|
||||
return request_firmware_nowait(THIS_MODULE, 1, il->firmware_name,
|
||||
&il->pci_dev->dev, GFP_KERNEL, il,
|
||||
@@ -4799,7 +4799,7 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
|
||||
|
||||
if (!ucode_raw) {
|
||||
if (il->fw_idx <= il->cfg->ucode_api_max)
|
||||
- IL_ERR("request for firmware file '%s' failed.\n",
|
||||
+ IL_ERR("request for firmware failed.\n",
|
||||
il->firmware_name);
|
||||
goto try_again;
|
||||
}
|
||||
@@ -4829,16 +4829,13 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
|
||||
* on the API version read from firmware header from here on forward
|
||||
*/
|
||||
if (api_ver < api_min || api_ver > api_max) {
|
||||
- IL_ERR("Driver unable to support your firmware API. "
|
||||
- "Driver supports v%u, firmware is v%u.\n", api_max,
|
||||
+ IL_ERR("Driver unable to support your firmware API.\n", api_max,
|
||||
api_ver);
|
||||
goto try_again;
|
||||
}
|
||||
|
||||
if (api_ver != api_max)
|
||||
- IL_ERR("Firmware has old API version. Expected v%u, "
|
||||
- "got v%u. New firmware can be obtained "
|
||||
- "from http://www.intellinuxwireless.org.\n", api_max,
|
||||
+ IL_ERR("Firmware has old API version.\n", api_max,
|
||||
api_ver);
|
||||
|
||||
IL_INFO("loaded firmware version %u.%u.%u.%u\n",
|
||||
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
|
||||
index 4e0f86f..05ac835 100644
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
|
||||
@@ -257,7 +257,7 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
|
||||
snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
|
||||
fw_pre_name, tag);
|
||||
|
||||
- IWL_DEBUG_INFO(drv, "attempting to load firmware '%s'\n",
|
||||
+ IWL_DEBUG_INFO(drv, "attempting to load firmware\n",
|
||||
drv->firmware_name);
|
||||
|
||||
return request_firmware_nowait(THIS_MODULE, 1, drv->firmware_name,
|
||||
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
|
||||
index 82863e9..1f2f235 100644
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
|
||||
@@ -1677,7 +1677,7 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm)
|
||||
|
||||
ret = iwl_mvm_load_ucode_wait_alive(mvm, IWL_UCODE_WOWLAN);
|
||||
if (ret) {
|
||||
- IWL_ERR(mvm, "Failed to start WoWLAN firmware: %d\n", ret);
|
||||
+ IWL_ERR(mvm, "Failed to start WoWLAN firmware\n", ret);
|
||||
goto error;
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
|
||||
index dac7e54..d2aefe6 100644
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
|
||||
@@ -410,7 +410,7 @@ int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm)
|
||||
ret = request_firmware(&fw_entry, mvm->nvm_file_name,
|
||||
mvm->trans->dev);
|
||||
if (ret) {
|
||||
- IWL_ERR(mvm, "ERROR: %s isn't available %d\n",
|
||||
+ IWL_ERR(mvm, "ERROR: firmware isn't available \n",
|
||||
mvm->nvm_file_name, ret);
|
||||
return ret;
|
||||
}
|
||||
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
|
||||
index 21e5ef0..520e63b 100644
|
||||
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
|
||||
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
|
||||
@@ -2074,9 +2074,9 @@ int rtl8xxxu_load_firmware(struct rtl8xxxu_priv *priv, char *fw_name)
|
||||
int ret = 0;
|
||||
u16 signature;
|
||||
|
||||
- dev_info(dev, "%s: Loading firmware %s\n", DRIVER_NAME, fw_name);
|
||||
+ dev_info(dev, "%s: Loading firmware\n", DRIVER_NAME, fw_name);
|
||||
if (request_firmware(&fw, fw_name, &priv->udev->dev)) {
|
||||
- dev_warn(dev, "request_firmware(%s) failed\n", fw_name);
|
||||
+ dev_warn(dev, "request_firmware failed\n", fw_name);
|
||||
ret = -EAGAIN;
|
||||
goto exit;
|
||||
}
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
|
||||
index b0ad061..dab2248 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
|
||||
@@ -106,7 +106,7 @@ static void rtl_fw_do_work(const struct firmware *firmware, void *context,
|
||||
err = request_firmware(&firmware,
|
||||
rtlpriv->cfg->alt_fw_name,
|
||||
rtlpriv->io.dev);
|
||||
- pr_info("Loading alternative firmware %s\n",
|
||||
+ pr_info("Loading alternative firmware \n",
|
||||
rtlpriv->cfg->alt_fw_name);
|
||||
if (!err)
|
||||
goto found_alt;
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
|
||||
index 774e720..a364c1b 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
|
||||
@@ -169,7 +169,7 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
|
||||
|
||||
fw_name = "rtlwifi/rtl8188efw.bin";
|
||||
rtlpriv->max_fw_size = 0x8000;
|
||||
- pr_info("Using firmware %s\n", fw_name);
|
||||
+ pr_info("Using firmware \n", fw_name);
|
||||
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
|
||||
index bcbb0c6..a1a9734 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
|
||||
@@ -170,7 +170,7 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
|
||||
fw_name = "rtlwifi/rtl8192cfw.bin";
|
||||
|
||||
rtlpriv->max_fw_size = 0x4000;
|
||||
- pr_info("Using firmware %s\n", fw_name);
|
||||
+ pr_info("Using firmware \n", fw_name);
|
||||
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
|
||||
index 96c923b..26eece2 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
|
||||
@@ -80,7 +80,7 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
|
||||
}
|
||||
/* provide name of alternative file */
|
||||
rtlpriv->cfg->alt_fw_name = "rtlwifi/rtl8192cufw.bin";
|
||||
- pr_info("Loading firmware %s\n", fw_name);
|
||||
+ pr_info("Loading firmware \n", fw_name);
|
||||
rtlpriv->max_fw_size = 0x4000;
|
||||
err = request_firmware_nowait(THIS_MODULE, 1,
|
||||
fw_name, rtlpriv->io.dev,
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
|
||||
index 16132c6..dc9db6d 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
|
||||
@@ -175,7 +175,7 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
|
||||
|
||||
rtlpriv->max_fw_size = 0x8000;
|
||||
pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
|
||||
- pr_info("Loading firmware file %s\n", fw_name);
|
||||
+ pr_info("Loading firmware file\n", fw_name);
|
||||
|
||||
/* request fw */
|
||||
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
|
||||
index eaa503b..343f691 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
|
||||
@@ -171,7 +171,7 @@ int rtl92ee_init_sw_vars(struct ieee80211_hw *hw)
|
||||
fw_name = "rtlwifi/rtl8192eefw.bin";
|
||||
|
||||
rtlpriv->max_fw_size = 0x8000;
|
||||
- pr_info("Using firmware %s\n", fw_name);
|
||||
+ pr_info("Using firmware \n", fw_name);
|
||||
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
|
||||
index 2006b09..475940e 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
|
||||
@@ -91,7 +91,7 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context)
|
||||
"Firmware callback routine entered!\n");
|
||||
complete(&rtlpriv->firmware_loading_complete);
|
||||
if (!firmware) {
|
||||
- pr_err("Firmware %s not available\n", fw_name);
|
||||
+ pr_err("Firmware not available\n", fw_name);
|
||||
rtlpriv->max_fw_size = 0;
|
||||
return;
|
||||
}
|
||||
@@ -209,7 +209,7 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
|
||||
rtlpriv->max_fw_size = RTL8190_MAX_FIRMWARE_CODE_SIZE*2 +
|
||||
sizeof(struct fw_hdr);
|
||||
pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
|
||||
- "Loading firmware %s\n", fw_name);
|
||||
+ "Loading firmware \n", fw_name);
|
||||
/* request fw */
|
||||
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
|
||||
index 7bf9f25..a2acfac 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
|
||||
@@ -178,7 +178,7 @@ int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
|
||||
fw_name = "rtlwifi/rtl8723fw_B.bin";
|
||||
|
||||
rtlpriv->max_fw_size = 0x6000;
|
||||
- pr_info("Using firmware %s\n", fw_name);
|
||||
+ pr_info("Using firmware \n", fw_name);
|
||||
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
|
||||
index f9d10f1..9048c51 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
|
||||
@@ -182,7 +182,7 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
|
||||
}
|
||||
|
||||
rtlpriv->max_fw_size = 0x8000;
|
||||
- pr_info("Using firmware %s\n", fw_name);
|
||||
+ pr_info("Using firmware \n", fw_name);
|
||||
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
|
||||
index d71d277..f2c70e1 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
|
||||
@@ -209,7 +209,7 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
|
||||
|
||||
rtlpriv->max_fw_size = 0x8000;
|
||||
/*load normal firmware*/
|
||||
- pr_info("Using firmware %s\n", fw_name);
|
||||
+ pr_info("Using firmware \n", fw_name);
|
||||
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
@@ -226,7 +226,7 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
|
||||
}
|
||||
}
|
||||
/*load wowlan firmware*/
|
||||
- pr_info("Using firmware %s\n", wowlan_fw_name);
|
||||
+ pr_info("Using firmware \n", wowlan_fw_name);
|
||||
err = request_firmware_nowait(THIS_MODULE, 1,
|
||||
wowlan_fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
Loading…
Add table
Add a link
Reference in a new issue