|
@@ -552,8 +552,8 @@ static struct attribute *dev_string_attrs[] = {
|
|
|
static mode_t dev_string_attrs_are_visible(struct kobject *kobj,
|
|
|
struct attribute *a, int n)
|
|
|
{
|
|
|
- struct usb_device *udev = to_usb_device(
|
|
|
- container_of(kobj, struct device, kobj));
|
|
|
+ struct device *dev = container_of(kobj, struct device, kobj);
|
|
|
+ struct usb_device *udev = to_usb_device(dev);
|
|
|
|
|
|
if (a == &dev_attr_manufacturer.attr) {
|
|
|
if (udev->manufacturer == NULL)
|
|
@@ -585,8 +585,8 @@ static ssize_t
|
|
|
read_descriptors(struct kobject *kobj, struct bin_attribute *attr,
|
|
|
char *buf, loff_t off, size_t count)
|
|
|
{
|
|
|
- struct usb_device *udev = to_usb_device(
|
|
|
- container_of(kobj, struct device, kobj));
|
|
|
+ struct device *dev = container_of(kobj, struct device, kobj);
|
|
|
+ struct usb_device *udev = to_usb_device(dev);
|
|
|
size_t nleft = count;
|
|
|
size_t srclen, n;
|
|
|
int cfgno;
|
|
@@ -786,8 +786,8 @@ static struct attribute *intf_assoc_attrs[] = {
|
|
|
static mode_t intf_assoc_attrs_are_visible(struct kobject *kobj,
|
|
|
struct attribute *a, int n)
|
|
|
{
|
|
|
- struct usb_interface *intf = to_usb_interface(
|
|
|
- container_of(kobj, struct device, kobj));
|
|
|
+ struct device *dev = container_of(kobj, struct device, kobj);
|
|
|
+ struct usb_interface *intf = to_usb_interface(dev);
|
|
|
|
|
|
if (intf->intf_assoc == NULL)
|
|
|
return 0;
|