Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
1b6bba97
Commit
1b6bba97
authored
Jan 22, 2003
by
Duncan Sands
Committed by
Greg Kroah-Hartman
Jan 22, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] USB: move udsl_atm_set_mac into speedtouch probe function
speedtouch: roll udsl_atm_set_mac into udsl_usb_probe.
parent
3279bbce
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
11 deletions
+4
-11
drivers/usb/misc/speedtouch.c
drivers/usb/misc/speedtouch.c
+4
-11
No files found.
drivers/usb/misc/speedtouch.c
View file @
1b6bba97
...
@@ -106,6 +106,8 @@
...
@@ -106,6 +106,8 @@
#define UDSL_ENDPOINT_DATA_OUT 0x07
#define UDSL_ENDPOINT_DATA_OUT 0x07
#define UDSL_ENDPOINT_DATA_IN 0x87
#define UDSL_ENDPOINT_DATA_IN 0x87
#define hex2int(c) ( (c >= '0')&&(c <= '9') ? (c - '0') : ((c & 0xf)+9) )
/* usb_device_id struct */
/* usb_device_id struct */
static
struct
usb_device_id
udsl_usb_ids
[]
=
{
static
struct
usb_device_id
udsl_usb_ids
[]
=
{
...
@@ -255,14 +257,6 @@ static void udsl_atm_stopdevice (struct udsl_instance_data *instance)
...
@@ -255,14 +257,6 @@ static void udsl_atm_stopdevice (struct udsl_instance_data *instance)
MOD_DEC_USE_COUNT
;
MOD_DEC_USE_COUNT
;
}
}
static
void
udsl_atm_set_mac
(
struct
udsl_instance_data
*
instance
,
const
char
mac
[
6
])
{
if
(
!
instance
->
atm_dev
)
return
;
memcpy
(
instance
->
atm_dev
->
esi
,
mac
,
6
);
}
/***************************************************************************
/***************************************************************************
*
*
...
@@ -806,8 +800,6 @@ static int udsl_usb_data_exit (struct udsl_instance_data *instance)
...
@@ -806,8 +800,6 @@ static int udsl_usb_data_exit (struct udsl_instance_data *instance)
* usb driver entries
* usb driver entries
*
*
****************************************************************************/
****************************************************************************/
#define hex2int(c) ( (c >= '0')&&(c <= '9') ? (c - '0') : ((c & 0xf)+9) )
static
int
udsl_usb_ioctl
(
struct
usb_interface
*
intf
,
unsigned
int
code
,
void
*
user_data
)
static
int
udsl_usb_ioctl
(
struct
usb_interface
*
intf
,
unsigned
int
code
,
void
*
user_data
)
{
{
...
@@ -873,7 +865,8 @@ static int udsl_usb_probe (struct usb_interface *intf, const struct usb_device_i
...
@@ -873,7 +865,8 @@ static int udsl_usb_probe (struct usb_interface *intf, const struct usb_device_i
PDEBUG
(
"MAC is %02x:%02x:%02x:%02x:%02x:%02x
\n
"
,
mac
[
0
],
mac
[
1
],
mac
[
2
],
mac
[
3
],
mac
[
4
],
PDEBUG
(
"MAC is %02x:%02x:%02x:%02x:%02x:%02x
\n
"
,
mac
[
0
],
mac
[
1
],
mac
[
2
],
mac
[
3
],
mac
[
4
],
mac
[
5
]);
mac
[
5
]);
udsl_atm_set_mac
(
instance
,
mac
);
memcpy
(
instance
->
atm_dev
->
esi
,
mac
,
6
);
usb_set_intfdata
(
intf
,
instance
);
usb_set_intfdata
(
intf
,
instance
);
return
0
;
return
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment