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
a2870c79
Commit
a2870c79
authored
Jun 06, 2004
by
Greg Kroah-Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
USB: make usb devices remove their sysfs files when disconnected.
Signed-off-by:
Greg Kroah-Hartman
<
greg@kroah.com
>
parent
fcc95bca
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
30 deletions
+63
-30
drivers/usb/core/hub.c
drivers/usb/core/hub.c
+1
-0
drivers/usb/core/message.c
drivers/usb/core/message.c
+1
-0
drivers/usb/core/sysfs.c
drivers/usb/core/sysfs.c
+59
-30
drivers/usb/core/usb.h
drivers/usb/core/usb.h
+2
-0
No files found.
drivers/usb/core/hub.c
View file @
a2870c79
...
...
@@ -919,6 +919,7 @@ void usb_disconnect(struct usb_device **pdev)
release_address
(
udev
);
usbfs_remove_device
(
udev
);
up
(
&
udev
->
serialize
);
usb_remove_sysfs_dev_files
(
udev
);
device_unregister
(
&
udev
->
dev
);
}
...
...
drivers/usb/core/message.c
View file @
a2870c79
...
...
@@ -827,6 +827,7 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0)
interface
=
dev
->
actconfig
->
interface
[
i
];
dev_dbg
(
&
dev
->
dev
,
"unregistering interface %s
\n
"
,
interface
->
dev
.
bus_id
);
usb_remove_sysfs_intf_files
(
interface
);
device_del
(
&
interface
->
dev
);
}
...
...
drivers/usb/core/sysfs.c
View file @
a2870c79
...
...
@@ -2,8 +2,8 @@
* drivers/usb/core/sysfs.c
*
* (C) Copyright 2002 David Brownell
* (C) Copyright 2002 Greg Kroah-Hartman
* (C) Copyright 2002 IBM Corp.
* (C) Copyright 2002
,2004
Greg Kroah-Hartman
* (C) Copyright 2002
,2004
IBM Corp.
*
* All of the sysfs file attributes for usb devices and interfaces.
*
...
...
@@ -162,29 +162,35 @@ usb_descriptor_attr (bDeviceSubClass, "%02x\n")
usb_descriptor_attr
(
bDeviceProtocol
,
"%02x
\n
"
)
usb_descriptor_attr
(
bNumConfigurations
,
"%d
\n
"
)
static
struct
attribute
*
dev_attrs
[]
=
{
/* current configuration's attributes */
&
dev_attr_bNumInterfaces
.
attr
,
&
dev_attr_bConfigurationValue
.
attr
,
&
dev_attr_bmAttributes
.
attr
,
&
dev_attr_bMaxPower
.
attr
,
/* device attributes */
&
dev_attr_idVendor
.
attr
,
&
dev_attr_idProduct
.
attr
,
&
dev_attr_bcdDevice
.
attr
,
&
dev_attr_bDeviceClass
.
attr
,
&
dev_attr_bDeviceSubClass
.
attr
,
&
dev_attr_bDeviceProtocol
.
attr
,
&
dev_attr_bNumConfigurations
.
attr
,
&
dev_attr_speed
.
attr
,
&
dev_attr_devnum
.
attr
,
&
dev_attr_version
.
attr
,
&
dev_attr_maxchild
.
attr
,
NULL
,
};
static
struct
attribute_group
dev_attr_grp
=
{
.
attrs
=
dev_attrs
,
};
void
usb_create_sysfs_dev_files
(
struct
usb_device
*
udev
)
{
struct
device
*
dev
=
&
udev
->
dev
;
/* current configuration's attributes */
device_create_file
(
dev
,
&
dev_attr_bNumInterfaces
);
device_create_file
(
dev
,
&
dev_attr_bConfigurationValue
);
device_create_file
(
dev
,
&
dev_attr_bmAttributes
);
device_create_file
(
dev
,
&
dev_attr_bMaxPower
);
/* device attributes */
device_create_file
(
dev
,
&
dev_attr_idVendor
);
device_create_file
(
dev
,
&
dev_attr_idProduct
);
device_create_file
(
dev
,
&
dev_attr_bcdDevice
);
device_create_file
(
dev
,
&
dev_attr_bDeviceClass
);
device_create_file
(
dev
,
&
dev_attr_bDeviceSubClass
);
device_create_file
(
dev
,
&
dev_attr_bDeviceProtocol
);
device_create_file
(
dev
,
&
dev_attr_bNumConfigurations
);
/* speed varies depending on how you connect the device */
device_create_file
(
dev
,
&
dev_attr_speed
);
// FIXME iff there are other speed configs, show how many
sysfs_create_group
(
&
dev
->
kobj
,
&
dev_attr_grp
);
if
(
udev
->
descriptor
.
iManufacturer
)
device_create_file
(
dev
,
&
dev_attr_manufacturer
);
...
...
@@ -192,10 +198,20 @@ void usb_create_sysfs_dev_files (struct usb_device *udev)
device_create_file
(
dev
,
&
dev_attr_product
);
if
(
udev
->
descriptor
.
iSerialNumber
)
device_create_file
(
dev
,
&
dev_attr_serial
);
}
void
usb_remove_sysfs_dev_files
(
struct
usb_device
*
udev
)
{
struct
device
*
dev
=
&
udev
->
dev
;
device_create_file
(
dev
,
&
dev_attr_devnum
);
device_create_file
(
dev
,
&
dev_attr_version
);
device_create_file
(
dev
,
&
dev_attr_maxchild
);
sysfs_remove_group
(
&
dev
->
kobj
,
&
dev_attr_grp
);
if
(
udev
->
descriptor
.
iManufacturer
)
device_remove_file
(
dev
,
&
dev_attr_manufacturer
);
if
(
udev
->
descriptor
.
iProduct
)
device_remove_file
(
dev
,
&
dev_attr_product
);
if
(
udev
->
descriptor
.
iSerialNumber
)
device_remove_file
(
dev
,
&
dev_attr_serial
);
}
/* Interface fields */
...
...
@@ -217,13 +233,26 @@ usb_intf_attr (bInterfaceSubClass, "%02x\n")
usb_intf_attr
(
bInterfaceProtocol
,
"%02x
\n
"
)
usb_intf_attr
(
iInterface
,
"%02x
\n
"
)
static
struct
attribute
*
intf_attrs
[]
=
{
&
dev_attr_bInterfaceNumber
.
attr
,
&
dev_attr_bAlternateSetting
.
attr
,
&
dev_attr_bNumEndpoints
.
attr
,
&
dev_attr_bInterfaceClass
.
attr
,
&
dev_attr_bInterfaceSubClass
.
attr
,
&
dev_attr_bInterfaceProtocol
.
attr
,
&
dev_attr_iInterface
.
attr
,
NULL
,
};
static
struct
attribute_group
intf_attr_grp
=
{
.
attrs
=
intf_attrs
,
};
void
usb_create_sysfs_intf_files
(
struct
usb_interface
*
intf
)
{
device_create_file
(
&
intf
->
dev
,
&
dev_attr_bInterfaceNumber
);
device_create_file
(
&
intf
->
dev
,
&
dev_attr_bAlternateSetting
);
device_create_file
(
&
intf
->
dev
,
&
dev_attr_bNumEndpoints
);
device_create_file
(
&
intf
->
dev
,
&
dev_attr_bInterfaceClass
);
device_create_file
(
&
intf
->
dev
,
&
dev_attr_bInterfaceSubClass
);
device_create_file
(
&
intf
->
dev
,
&
dev_attr_bInterfaceProtocol
);
device_create_file
(
&
intf
->
dev
,
&
dev_attr_iInterface
);
sysfs_create_group
(
&
intf
->
dev
.
kobj
,
&
intf_attr_grp
);
}
void
usb_remove_sysfs_intf_files
(
struct
usb_interface
*
intf
)
{
sysfs_remove_group
(
&
intf
->
dev
.
kobj
,
&
intf_attr_grp
);
}
drivers/usb/core/usb.h
View file @
a2870c79
/* Functions local to drivers/usb/core/ */
extern
void
usb_create_sysfs_dev_files
(
struct
usb_device
*
dev
);
extern
void
usb_remove_sysfs_dev_files
(
struct
usb_device
*
dev
);
extern
void
usb_create_sysfs_intf_files
(
struct
usb_interface
*
intf
);
extern
void
usb_remove_sysfs_intf_files
(
struct
usb_interface
*
intf
);
extern
int
usb_probe_interface
(
struct
device
*
dev
);
extern
int
usb_unbind_interface
(
struct
device
*
dev
);
...
...
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