linux-kernel - [PATCH] stagging: android: logger: code cleanup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1403463068-21850-1-git-send-email-gerb.stralko@gmail.com>
Date:	Sun, 22 Jun 2014 14:51:08 -0400
From:	Jerry Stralko <gerb.stralko@...il.com>
To:	greg@...ah.com, linux-kernel@...r.kernel.org
Cc:	swetland@...gle.com, Jerry Stralko <gerb.stralko@...il.com>
Subject: [PATCH] stagging: android: logger: code cleanup

Add the unlikey macro to the return value of nonseekable_open,
since it always returns successfully.

Fixed up some checkpatch warnings.

Signed-off-by: Jerry Stralko <gerb.stralko@...il.com>
---
 drivers/staging/android/logger.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 2772e01..b98d181 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,
@@ -552,7 +551,7 @@ static int logger_open(struct inode *inode, struct file *file)
 	int ret;
 
 	ret = nonseekable_open(inode, file);
-	if (ret)
+	if (unlikely(ret))
 		return ret;
 
 	log = get_log_from_minor(MINOR(inode->i_rdev));
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/