summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android
diff options
context:
space:
mode:
authorJerry Stralko <gerb.stralko@gmail.com>2014-07-01 07:13:18 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-08 15:42:19 -0700
commit48d5bb4403a0380613267770f9dccb73ab7f98fa (patch)
treeae82e3613ac8b38ebf0ef448d6c5bda426541d19 /drivers/staging/android
parent403f8af323f0b3b1893ef257be5c5a41cd213d55 (diff)
downloadop-kernel-dev-48d5bb4403a0380613267770f9dccb73ab7f98fa.zip
op-kernel-dev-48d5bb4403a0380613267770f9dccb73ab7f98fa.tar.gz
staging: android: logger: fixed checkpatch.pl warnings.
Signed-off-by: Jerry Stralko <gerb.stralko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
-rw-r--r--drivers/staging/android/logger.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 2772e01..9b47e66 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -110,8 +110,8 @@ static inline struct logger_log *file_get_log(struct file *file)
struct logger_reader *reader = file->private_data;
return reader->log;
- } else
- return file->private_data;
+ }
+ return file->private_data;
}
/*
@@ -159,8 +159,7 @@ static size_t get_user_hdr_len(int ver)
{
if (ver < 2)
return sizeof(struct user_logger_entry_compat);
- else
- return sizeof(struct logger_entry);
+ return sizeof(struct logger_entry);
}
static ssize_t copy_header_to_user(int ver, struct logger_entry *entry,
OpenPOWER on IntegriCloud