From: Martin Kaiser <martin@kaiser.cx>
To: linux-kernel@vger.kernel.org
Cc: Martin Kaiser <martin@kaiser.cx>, Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH] char: misc: minor code cleanup
Date: Mon, 27 Feb 2017 23:27:58 +0100 [thread overview]
Message-ID: <1488234485-26111-1-git-send-email-martin@kaiser.cx> (raw)
Fix a couple of minor issues found by checkpatch.pl:
Add/remove spaces where required.
Move EXPORT_SYMBOL() to the end of the function it refers to.
Set the access mode for the proc entry explicity.
Use pr_warn() instead of printk() without loglevel.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/char/misc.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 8069b36..c2a2048 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -109,7 +109,7 @@ static int misc_seq_open(struct inode *inode, struct file *file)
};
#endif
-static int misc_open(struct inode * inode, struct file * file)
+static int misc_open(struct inode *inode, struct file *file)
{
int minor = iminor(inode);
struct miscdevice *c;
@@ -150,7 +150,7 @@ static int misc_open(struct inode * inode, struct file * file)
err = 0;
replace_fops(file, new_fops);
if (file->f_op->open)
- err = file->f_op->open(inode,file);
+ err = file->f_op->open(inode, file);
fail:
mutex_unlock(&misc_mtx);
return err;
@@ -182,7 +182,7 @@ static int misc_open(struct inode * inode, struct file * file)
* failure.
*/
-int misc_register(struct miscdevice * misc)
+int misc_register(struct miscdevice *misc)
{
dev_t dev;
int err = 0;
@@ -194,6 +194,7 @@ int misc_register(struct miscdevice * misc)
if (is_dynamic) {
int i = find_first_zero_bit(misc_minors, DYNAMIC_MINORS);
+
if (i >= DYNAMIC_MINORS) {
err = -EBUSY;
goto out;
@@ -237,6 +238,7 @@ int misc_register(struct miscdevice * misc)
mutex_unlock(&misc_mtx);
return err;
}
+EXPORT_SYMBOL(misc_register);
/**
* misc_deregister - unregister a miscellaneous device
@@ -260,8 +262,6 @@ void misc_deregister(struct miscdevice *misc)
clear_bit(i, misc_minors);
mutex_unlock(&misc_mtx);
}
-
-EXPORT_SYMBOL(misc_register);
EXPORT_SYMBOL(misc_deregister);
static char *misc_devnode(struct device *dev, umode_t *mode)
@@ -280,20 +280,20 @@ static int __init misc_init(void)
int err;
struct proc_dir_entry *ret;
- ret = proc_create("misc", 0, NULL, &misc_proc_fops);
+ ret = proc_create("misc", 0444, NULL, &misc_proc_fops);
misc_class = class_create(THIS_MODULE, "misc");
err = PTR_ERR(misc_class);
if (IS_ERR(misc_class))
goto fail_remove;
err = -EIO;
- if (register_chrdev(MISC_MAJOR,"misc",&misc_fops))
+ if (register_chrdev(MISC_MAJOR, "misc", &misc_fops))
goto fail_printk;
misc_class->devnode = misc_devnode;
return 0;
fail_printk:
- printk("unable to get major %d for misc devices\n", MISC_MAJOR);
+ pr_warn("unable to get major %d for misc devices\n", MISC_MAJOR);
class_destroy(misc_class);
fail_remove:
if (ret)
--
1.7.10.4
next reply other threads:[~2017-02-28 4:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-27 22:27 Martin Kaiser [this message]
2017-04-08 16:11 ` [PATCH] char: misc: minor code cleanup Greg Kroah-Hartman
2017-04-17 18:22 ` [PATCH 1/2 v2] char: misc: move the EXPORT_SYMBOL() declarations Martin Kaiser
2017-04-17 18:22 ` [PATCH 2/2 v2] char: misc: use octal permissions for the proc entry Martin Kaiser
2017-04-18 4:31 ` Greg Kroah-Hartman
2017-04-18 7:51 ` Martin Kaiser
2017-04-18 8:15 ` Greg Kroah-Hartman
2017-04-18 9:11 ` Martin Kaiser
[not found] ` <CAHp75Vec84Ltp2oGQwCKv9CwhzTFCu0znR_tmoLstctn_UR88A@mail.gmail.com>
2017-04-29 7:05 ` Martin Kaiser
2017-04-30 12:52 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488234485-26111-1-git-send-email-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).