Skip to content

Commit

Permalink
staging: usbip: stub_main.c: reorder functions
Browse files Browse the repository at this point in the history
Reorder functions so sysfs_ops, show() and store(), are adjacent, and
init_busid_table() is at the beginning of the file.

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
matt mooney authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent 8735276 commit efad25e
Showing 1 changed file with 24 additions and 24 deletions.
48 changes: 24 additions & 24 deletions drivers/staging/usbip/stub_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,21 @@ struct kmem_cache *stub_priv_cache;
static struct bus_id_priv busid_table[MAX_BUSID];
static spinlock_t busid_table_lock;

static void init_busid_table(void)
{
int i;

for (i = 0; i < MAX_BUSID; i++) {
memset(busid_table[i].name, 0, BUSID_SIZE);
busid_table[i].status = STUB_BUSID_OTHER;
busid_table[i].interf_count = 0;
busid_table[i].sdev = NULL;
busid_table[i].shutdown_busid = 0;
}

spin_lock_init(&busid_table_lock);
}

int match_busid(const char *busid)
{
int i;
Expand Down Expand Up @@ -69,21 +84,6 @@ struct bus_id_priv *get_busid_priv(const char *busid)
return NULL;
}

static ssize_t show_match_busid(struct device_driver *drv, char *buf)
{
int i;
char *out = buf;

spin_lock(&busid_table_lock);
for (i = 0; i < MAX_BUSID; i++)
if (busid_table[i].name[0])
out += sprintf(out, "%s ", busid_table[i].name);
spin_unlock(&busid_table_lock);

out += sprintf(out, "\n");
return out - buf;
}

static int add_match_busid(char *busid)
{
int i;
Expand Down Expand Up @@ -128,19 +128,19 @@ int del_match_busid(char *busid)
return -1;
}

static void init_busid_table(void)
static ssize_t show_match_busid(struct device_driver *drv, char *buf)
{
int i;
char *out = buf;

for (i = 0; i < MAX_BUSID; i++) {
memset(busid_table[i].name, 0, BUSID_SIZE);
busid_table[i].status = STUB_BUSID_OTHER;
busid_table[i].interf_count = 0;
busid_table[i].sdev = NULL;
busid_table[i].shutdown_busid = 0;
}
spin_lock(&busid_table_lock);
for (i = 0; i < MAX_BUSID; i++)
if (busid_table[i].name[0])
out += sprintf(out, "%s ", busid_table[i].name);
spin_unlock(&busid_table_lock);

spin_lock_init(&busid_table_lock);
out += sprintf(out, "\n");
return out - buf;
}

static ssize_t store_match_busid(struct device_driver *dev, const char *buf,
Expand Down

0 comments on commit efad25e

Please sign in to comment.