Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a285cf5 authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman
Browse files

staging: usbip: userspace: set kernel module names in one place 



Move kernel module name setting to usbip_common.h so that macros can
be used instead of hard coding the names in multiple places.

Signed-off-by: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 988e7520

drivers/staging/usbip/userspace/libsrc/stub_driver.c

+5 −7
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ 


#include "usbip.h"



/* kernel module name */

static const char *usbip_stub_driver_name = "usbip-host";





struct usbip_stub_driver *stub_driver;



static struct sysfs_driver *open_sysfs_stub_driver(void)
@@ -31,11 +27,12 @@ static struct sysfs_driver *open_sysfs_stub_driver(void) 


	snprintf(stub_driver_path, SYSFS_PATH_MAX, "%s/%s/usb/%s/%s",

			sysfs_mntpath, SYSFS_BUS_NAME, SYSFS_DRIVERS_NAME,

			usbip_stub_driver_name);

			USBIP_HOST_DRV_NAME);



	stub_driver = sysfs_open_driver_path(stub_driver_path);

	if (!stub_driver) {

		err("usbip-core.ko and usbip-host.ko must be loaded");

		err(USBIP_CORE_MOD_NAME ".ko and " USBIP_HOST_DRV_NAME

		    ".ko must be loaded");

		return NULL;

	}
@@ -200,7 +197,8 @@ static int refresh_exported_devices(void) 


	suinf_list = sysfs_get_driver_devices(stub_driver->sysfs_driver);

	if (!suinf_list) {

		printf("Bind usbip-host.ko to a usb device to be exportable!\n");

		info("bind " USBIP_HOST_DRV_NAME ".ko to a usb device to be "

		     "exportable!\n");

		goto bye;

	}

drivers/staging/usbip/userspace/libsrc/usbip_common.h

+5 −1
Original line number Diff line number Diff line
@@ -26,7 +26,11 @@ 
#define VHCI_STATE_PATH "/var/run/vhci_hcd"

#endif



//#include <linux/usb_ch9.h>

/* kernel module names */

#define USBIP_CORE_MOD_NAME	"usbip-core"

#define USBIP_HOST_DRV_NAME	"usbip-host"

#define USBIP_VHCI_DRV_NAME	"vhci_hcd"



enum usb_device_speed {

	USB_SPEED_UNKNOWN = 0,                  /* enumerating */

	USB_SPEED_LOW, USB_SPEED_FULL,          /* usb 1.1 */

drivers/staging/usbip/userspace/libsrc/vhci_driver.c

+3 −5
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 


#include "usbip.h"





static const char vhci_driver_name[] = "vhci_hcd";



struct usbip_vhci_driver *vhci_driver;



static struct usbip_imported_device *imported_device_init(struct usbip_imported_device *idev, char *busid)
@@ -277,12 +274,13 @@ static int get_hc_busid(char *sysfs_mntpath, char *hc_busid) 


        snprintf(sdriver_path, SYSFS_PATH_MAX, "%s/%s/platform/%s/%s",

                                sysfs_mntpath, SYSFS_BUS_NAME, SYSFS_DRIVERS_NAME,

                                vhci_driver_name);

                                USBIP_VHCI_DRV_NAME);



        sdriver = sysfs_open_driver_path(sdriver_path);

        if (!sdriver) {

		info("%s is not found", sdriver_path);

                info("load usbip-core.ko and vhci-hcd.ko !");

                info("please load " USBIP_CORE_MOD_NAME ".ko and "

		     USBIP_VHCI_DRV_NAME ".ko!");

                return -1;

        }

drivers/staging/usbip/userspace/src/bind-driver.c

+16 −7
Original line number Diff line number Diff line
@@ -3,13 +3,12 @@ 
 * Copyright (C) 2005-2007 Takahiro Hirofuchi

 */



#include "utils.h"



#define _GNU_SOURCE

#include <getopt.h>

#include <glib.h>





#include "usbip.h"

#include "utils.h"



static const struct option longopts[] = {

	{"usbip",	required_argument,	NULL, 'u'},
@@ -27,9 +26,6 @@ static const struct option longopts[] = { 
	{NULL,		0,			NULL,  0}

};



static const char match_busid_path[] = "/sys/bus/usb/drivers/usbip-host/match_busid";





static void show_help(void)

{

	printf("Usage: usbip_bind_driver [OPTION]\n");
@@ -51,6 +47,18 @@ static int modify_match_busid(char *busid, int add) 
	int fd;

	int ret;

	char buff[BUS_ID_SIZE + 4];

	char sysfs_mntpath[SYSFS_PATH_MAX];

	char match_busid_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(match_busid_path, sizeof(match_busid_path),

		 "%s/%s/usb/%s/%s/match_busid", sysfs_mntpath, SYSFS_BUS_NAME,

		 SYSFS_DRIVERS_NAME, USBIP_HOST_DRV_NAME);



	/* BUS_IS_SIZE includes NULL termination? */

	if (strnlen(busid, BUS_ID_SIZE) > BUS_ID_SIZE - 1) {
@@ -228,7 +236,8 @@ static int bind_to_usbip(char *busid) 
	for (i = 0; i < ninterface; i++) {

		int ret;



		ret = bind_interface(busid, configvalue, i, "usbip-host");

		ret = bind_interface(busid, configvalue, i,

				     USBIP_HOST_DRV_NAME);

		if (ret < 0) {

			g_warning("bind usbip at %s:%d.%d, failed",

					busid, configvalue, i);