Commit 36679ea5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] USB: make usb_create_ep_files take a struct device 



Instead of a kobject, will make things easier in the future (don't know
what I was thinking when I did this originally...)

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 84412f62

drivers/usb/core/endpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static struct kobj_type ep_object_ktype = { 
	.default_attrs =	ep_attrs,

};



void usb_create_ep_files(struct kobject *parent,

void usb_create_ep_files(struct device *parent,

			 struct usb_host_endpoint *endpoint,

			 struct usb_device *udev)

{
@@ -189,7 +189,7 @@ void usb_create_ep_files(struct kobject *parent, 


	kobj = &ep_obj->kobj;

	kobject_set_name(kobj, "ep_%02x", endpoint->desc.bEndpointAddress);

	kobj->parent = parent;

	kobj->parent = &parent->kobj;

	kobj->ktype = &ep_object_ktype;



	/* Don't use kobject_register, because it generates a hotplug event */

drivers/usb/core/sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void usb_create_sysfs_dev_files (struct usb_device *udev) 
	if (udev->serial)

		device_create_file (dev, &dev_attr_serial);

	device_create_file (dev, &dev_attr_configuration);

	usb_create_ep_files(&dev->kobj, &udev->ep0, udev);

	usb_create_ep_files(dev, &udev->ep0, udev);

}



void usb_remove_sysfs_dev_files (struct usb_device *udev)
@@ -327,7 +327,7 @@ static inline void usb_create_intf_ep_files(struct usb_interface *intf, 


	iface_desc = intf->cur_altsetting;

	for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i)

		usb_create_ep_files(&intf->dev.kobj, &iface_desc->endpoint[i],

		usb_create_ep_files(&intf->dev, &iface_desc->endpoint[i],

				udev);

}

drivers/usb/core/usb.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 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 void usb_create_ep_files(struct kobject *parent, struct usb_host_endpoint *endpoint,

extern void usb_create_ep_files(struct device *parent, struct usb_host_endpoint *endpoint,

				struct usb_device *udev);

extern void usb_remove_ep_files(struct usb_host_endpoint *endpoint);