diff options
| author | Tony Luck <tony.luck@intel.com> | 2011-08-02 18:08:30 -0400 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2012-05-25 12:24:39 -0400 |
| commit | 4cd7cac2be4ce2e906e628314f0023ec2ee3284a (patch) | |
| tree | 6634e0922ec455c2b3988f788ab8a4f386c23b73 | |
| parent | 7bbc19d84d0ea21f5f14dd67de77beeee4880e44 (diff) | |
efivars: fix warnings when CONFIG_PSTORE=n
BugLink: http://bugs.launchpad.net/bugs/996109
commit b728a5c806fb36f9adebf2a862bbd015e074afca upstream.
drivers/firmware/efivars.c:161: warning: ‘utf16_strlen’ defined but not used
utf16_strlen() is only used inside CONFIG_PSTORE - make this "static inline"
to shut the compiler up [thanks to hpa for the suggestion].
drivers/firmware/efivars.c:602: warning: initialization from incompatible pointer type
Between v1 and v2 of this patch series we decided to make the "part" number
unsigned - but missed fixing the stub version of efi_pstore_write()
Acked-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Mike Waychison <mikew@google.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
[took the static part of the patch, not the pstore part, for 3.0-stable,
to fix the compiler warning we had - gregkh]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/firmware/efivars.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index 0ba8d69dd6c..d5106c0f46c 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c | |||
| @@ -150,7 +150,7 @@ utf16_strnlen(efi_char16_t *s, size_t maxlength) | |||
| 150 | return length; | 150 | return length; |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | static unsigned long | 153 | static inline unsigned long |
| 154 | utf16_strlen(efi_char16_t *s) | 154 | utf16_strlen(efi_char16_t *s) |
| 155 | { | 155 | { |
| 156 | return utf16_strnlen(s, ~0UL); | 156 | return utf16_strnlen(s, ~0UL); |