From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, Joe Perches <joe@perches.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org
Subject: [PATCH 6/7] usb: core: reuse kbasename()
Date: Tue, 2 Oct 2012 18:00:59 +0300 [thread overview]
Message-ID: <1349190062-13107-6-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1349190062-13107-1-git-send-email-andriy.shevchenko@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
---
drivers/usb/core/file.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index e5387a4..eff9af9 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -19,6 +19,7 @@
#include <linux/errno.h>
#include <linux/rwsem.h>
#include <linux/slab.h>
+#include <linux/string.h>
#include <linux/usb.h>
#include "usb.h"
@@ -163,7 +164,6 @@ int usb_register_dev(struct usb_interface *intf,
int minor_base = class_driver->minor_base;
int minor;
char name[20];
- char *temp;
#ifdef CONFIG_USB_DYNAMIC_MINORS
/*
@@ -200,14 +200,9 @@ int usb_register_dev(struct usb_interface *intf,
/* create a usb class device for this usb interface */
snprintf(name, sizeof(name), class_driver->name, minor - minor_base);
- temp = strrchr(name, '/');
- if (temp && (temp[1] != '\0'))
- ++temp;
- else
- temp = name;
intf->usb_dev = device_create(usb_class->class, &intf->dev,
MKDEV(USB_MAJOR, minor), class_driver,
- "%s", temp);
+ "%s", kbasename(name));
if (IS_ERR(intf->usb_dev)) {
down_write(&minor_rwsem);
usb_minors[minor] = NULL;
--
1.7.10.4
next prev parent reply other threads:[~2012-10-02 15:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 15:00 [PATCH 1/7] string: introduce helper to get base file name from given path Andy Shevchenko
2012-10-02 15:00 ` [PATCH 2/7] lib: dynamic_debug: reuse kbasename() Andy Shevchenko
2012-10-02 15:00 ` [PATCH 3/7] staging: rts_pstor: " Andy Shevchenko
2012-10-03 0:30 ` Ryan Mallon
2012-10-03 0:33 ` Ryan Mallon
2012-10-02 15:00 ` [PATCH 4/7] mm: reuse kbasename() functionality Andy Shevchenko
2012-10-02 15:00 ` [PATCH 5/7] procfs: " Andy Shevchenko
2012-10-02 15:00 ` Andy Shevchenko [this message]
2012-10-03 8:27 ` [PATCH 6/7] usb: core: reuse kbasename() Andy Shevchenko
2012-10-03 15:08 ` Greg Kroah-Hartman
2012-10-17 7:42 ` Andy Shevchenko
2012-10-02 15:01 ` [PATCH 7/7] trace: reuse kbasename() functionality Andy Shevchenko
2012-10-02 17:34 ` [PATCH 1/7] string: introduce helper to get base file name from given path Greg KH
2012-10-02 17:52 ` Andy Shevchenko
2012-10-02 18:12 ` Greg KH
2012-10-03 18:39 ` Nick Bowler
2012-10-04 8:19 ` 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=1349190062-13107-6-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@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).