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
032100f6
Commit
032100f6
authored
Nov 01, 2010
by
Stephen Hemminger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
beceem: remove unnecessary usb class
Signed-off-by:
Stephen Hemminger
<
shemminger@vyatta.com
>
parent
ada692b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
63 deletions
+2
-63
drivers/staging/bcm/Adapter.h
drivers/staging/bcm/Adapter.h
+1
-1
drivers/staging/bcm/InterfaceInit.c
drivers/staging/bcm/InterfaceInit.c
+1
-62
No files found.
drivers/staging/bcm/Adapter.h
View file @
032100f6
...
@@ -553,7 +553,7 @@ struct _MINI_ADAPTER
...
@@ -553,7 +553,7 @@ struct _MINI_ADAPTER
struct
semaphore
NVMRdmWrmLock
;
struct
semaphore
NVMRdmWrmLock
;
struct
device
*
pstCreatedClassDevice
;
struct
device
*
pstCreatedClassDevice
;
BOOLEAN
bUsbClassDriverRegistered
;
// BOOLEAN InterfaceUpStatus;
// BOOLEAN InterfaceUpStatus;
PFLASH2X_CS_INFO
psFlash2xCSInfo
;
PFLASH2X_CS_INFO
psFlash2xCSInfo
;
PFLASH_CS_INFO
psFlashCSInfo
;
PFLASH_CS_INFO
psFlashCSInfo
;
...
...
drivers/staging/bcm/InterfaceInit.c
View file @
032100f6
...
@@ -63,29 +63,6 @@ VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
...
@@ -63,29 +63,6 @@ VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
AdapterFree
(
psIntfAdapter
->
psAdapter
);
AdapterFree
(
psIntfAdapter
->
psAdapter
);
}
}
static
int
usbbcm_open
(
struct
inode
*
inode
,
struct
file
*
file
)
{
return
0
;
}
static
int
usbbcm_release
(
struct
inode
*
inode
,
struct
file
*
file
)
{
return
0
;
}
static
ssize_t
usbbcm_read
(
struct
file
*
file
,
char
__user
*
buffer
,
size_t
count
,
loff_t
*
ppos
)
{
return
0
;
}
static
ssize_t
usbbcm_write
(
struct
file
*
file
,
const
char
__user
*
user_buffer
,
size_t
count
,
loff_t
*
ppos
)
{
return
0
;
}
VOID
ConfigureEndPointTypesThroughEEPROM
(
PMINI_ADAPTER
Adapter
)
VOID
ConfigureEndPointTypesThroughEEPROM
(
PMINI_ADAPTER
Adapter
)
{
{
ULONG
ulReg
=
0
;
ULONG
ulReg
=
0
;
...
@@ -164,21 +141,6 @@ VOID ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)
...
@@ -164,21 +141,6 @@ VOID ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)
}
}
static
struct
file_operations
usbbcm_fops
=
{
.
open
=
usbbcm_open
,
.
release
=
usbbcm_release
,
.
read
=
usbbcm_read
,
.
write
=
usbbcm_write
,
.
owner
=
THIS_MODULE
,
.
llseek
=
no_llseek
,
};
static
struct
usb_class_driver
usbbcm_class
=
{
.
name
=
"usbbcm"
,
.
fops
=
&
usbbcm_fops
,
.
minor_base
=
BCM_USB_MINOR_BASE
,
};
static
int
static
int
usbbcm_device_probe
(
struct
usb_interface
*
intf
,
const
struct
usb_device_id
*
id
)
usbbcm_device_probe
(
struct
usb_interface
*
intf
,
const
struct
usb_device_id
*
id
)
{
{
...
@@ -259,8 +221,6 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
...
@@ -259,8 +221,6 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
usb_set_intfdata
(
intf
,
NULL
);
usb_set_intfdata
(
intf
,
NULL
);
udev
=
interface_to_usbdev
(
intf
);
udev
=
interface_to_usbdev
(
intf
);
usb_put_dev
(
udev
);
usb_put_dev
(
udev
);
if
(
psAdapter
->
bUsbClassDriverRegistered
==
TRUE
)
usb_deregister_dev
(
intf
,
&
usbbcm_class
);
InterfaceAdapterFree
(
psIntfAdapter
);
InterfaceAdapterFree
(
psIntfAdapter
);
return
retval
;
return
retval
;
}
}
...
@@ -339,10 +299,8 @@ static void usbbcm_disconnect (struct usb_interface *intf)
...
@@ -339,10 +299,8 @@ static void usbbcm_disconnect (struct usb_interface *intf)
InterfaceAdapterFree
(
psIntfAdapter
);
InterfaceAdapterFree
(
psIntfAdapter
);
udev
=
interface_to_usbdev
(
intf
);
udev
=
interface_to_usbdev
(
intf
);
usb_put_dev
(
udev
);
usb_put_dev
(
udev
);
usb_deregister_dev
(
intf
,
&
usbbcm_class
);
}
}
static
int
AllocUsbCb
(
PS_INTERFACE_ADAPTER
psIntfAdapter
)
static
int
AllocUsbCb
(
PS_INTERFACE_ADAPTER
psIntfAdapter
)
{
{
int
i
=
0
;
int
i
=
0
;
...
@@ -701,18 +659,6 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
...
@@ -701,18 +659,6 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
}
}
}
}
usb_set_intfdata
(
psIntfAdapter
->
interface
,
psIntfAdapter
);
usb_set_intfdata
(
psIntfAdapter
->
interface
,
psIntfAdapter
);
retval
=
usb_register_dev
(
psIntfAdapter
->
interface
,
&
usbbcm_class
);
if
(
retval
)
{
BCM_DEBUG_PRINT
(
psIntfAdapter
->
psAdapter
,
DBG_TYPE_PRINTK
,
0
,
0
,
"usb register dev failed = %d"
,
retval
);
psIntfAdapter
->
psAdapter
->
bUsbClassDriverRegistered
=
FALSE
;
return
retval
;
}
else
{
psIntfAdapter
->
psAdapter
->
bUsbClassDriverRegistered
=
TRUE
;
BCM_DEBUG_PRINT
(
psIntfAdapter
->
psAdapter
,
DBG_TYPE_PRINTK
,
0
,
0
,
"usb dev registered"
);
}
psIntfAdapter
->
psAdapter
->
bcm_file_download
=
InterfaceFileDownload
;
psIntfAdapter
->
psAdapter
->
bcm_file_download
=
InterfaceFileDownload
;
psIntfAdapter
->
psAdapter
->
bcm_file_readback_from_chip
=
psIntfAdapter
->
psAdapter
->
bcm_file_readback_from_chip
=
...
@@ -734,14 +680,7 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
...
@@ -734,14 +680,7 @@ INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
}
}
retval
=
device_run
(
psIntfAdapter
);
return
device_run
(
psIntfAdapter
);
if
(
retval
)
{
return
retval
;
}
return
0
;
}
}
static
int
InterfaceSuspend
(
struct
usb_interface
*
intf
,
pm_message_t
message
)
static
int
InterfaceSuspend
(
struct
usb_interface
*
intf
,
pm_message_t
message
)
...
...
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