Commit 58058422 authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman

staging: usbip: userspace: vhci_driver: parameterize path names

Define a macro for the bus type and use libsysfs for class path.
Signed-off-by: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7e485ee7
...@@ -186,9 +186,20 @@ static int refresh_class_device_list(void) ...@@ -186,9 +186,20 @@ static int refresh_class_device_list(void)
int ret; int ret;
struct dlist *cname_list; struct dlist *cname_list;
char *cname; char *cname;
char sysfs_mntpath[SYSFS_PATH_MAX];
char class_path[SYSFS_PATH_MAX];
ret = sysfs_get_mnt_path(sysfs_mntpath, SYSFS_PATH_MAX);
if (ret < 0) {
err("sysfs must be mounted");
return -1;
}
snprintf(class_path, sizeof(class_path), "%s/%s", sysfs_mntpath,
SYSFS_CLASS_NAME);
/* search under /sys/class */ /* search under /sys/class */
cname_list = sysfs_open_directory_list("/sys/class"); cname_list = sysfs_open_directory_list(class_path);
if (!cname_list) { if (!cname_list) {
err("open class directory"); err("open class directory");
return -1; return -1;
...@@ -274,8 +285,8 @@ static int get_hc_busid(char *sysfs_mntpath, char *hc_busid) ...@@ -274,8 +285,8 @@ static int get_hc_busid(char *sysfs_mntpath, char *hc_busid)
int found = 0; int found = 0;
snprintf(sdriver_path, SYSFS_PATH_MAX, "%s/%s/platform/%s/%s", snprintf(sdriver_path, SYSFS_PATH_MAX, "%s/%s/%s/%s/%s", sysfs_mntpath,
sysfs_mntpath, SYSFS_BUS_NAME, SYSFS_DRIVERS_NAME, SYSFS_BUS_NAME, USBIP_VHCI_BUS_TYPE, SYSFS_DRIVERS_NAME,
USBIP_VHCI_DRV_NAME); USBIP_VHCI_DRV_NAME);
sdriver = sysfs_open_driver_path(sdriver_path); sdriver = sysfs_open_driver_path(sdriver_path);
...@@ -333,7 +344,8 @@ int usbip_vhci_driver_open(void) ...@@ -333,7 +344,8 @@ int usbip_vhci_driver_open(void)
goto err; goto err;
/* will be freed in usbip_driver_close() */ /* will be freed in usbip_driver_close() */
vhci_driver->hc_device = sysfs_open_device("platform", hc_busid); vhci_driver->hc_device = sysfs_open_device(USBIP_VHCI_BUS_TYPE,
hc_busid);
if (!vhci_driver->hc_device) { if (!vhci_driver->hc_device) {
err("get sysfs vhci_driver"); err("get sysfs vhci_driver");
goto err; goto err;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "usbip.h" #include "usbip.h"
#define USBIP_VHCI_BUS_TYPE "platform"
#define MAXNPORT 128 #define MAXNPORT 128
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment