[PATCH] Driver Core: drivers/s390/net/qeth_sys.c - drivers/usb/gadget/pxa2xx_udc.c: update device attribute callbacks
Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Esse commit está contido em:

commit de
Greg Kroah-Hartman

pai
3fd3c0a5f5
commit
10523b3b82
@@ -24,7 +24,7 @@
|
||||
|
||||
/* Active configuration fields */
|
||||
#define usb_actconfig_show(field, multiplier, format_string) \
|
||||
static ssize_t show_##field (struct device *dev, char *buf) \
|
||||
static ssize_t show_##field (struct device *dev, struct device_attribute *attr, char *buf) \
|
||||
{ \
|
||||
struct usb_device *udev; \
|
||||
struct usb_host_config *actconfig; \
|
||||
@@ -46,7 +46,7 @@ usb_actconfig_attr (bNumInterfaces, 1, "%2d\n")
|
||||
usb_actconfig_attr (bmAttributes, 1, "%2x\n")
|
||||
usb_actconfig_attr (bMaxPower, 2, "%3dmA\n")
|
||||
|
||||
static ssize_t show_configuration_string(struct device *dev, char *buf)
|
||||
static ssize_t show_configuration_string(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_device *udev;
|
||||
struct usb_host_config *actconfig;
|
||||
@@ -69,7 +69,7 @@ static DEVICE_ATTR(configuration, S_IRUGO, show_configuration_string, NULL);
|
||||
usb_actconfig_show(bConfigurationValue, 1, "%u\n");
|
||||
|
||||
static ssize_t
|
||||
set_bConfigurationValue (struct device *dev, const char *buf, size_t count)
|
||||
set_bConfigurationValue (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
|
||||
{
|
||||
struct usb_device *udev = udev = to_usb_device (dev);
|
||||
int config, value;
|
||||
@@ -87,7 +87,7 @@ static DEVICE_ATTR(bConfigurationValue, S_IRUGO | S_IWUSR,
|
||||
|
||||
/* String fields */
|
||||
#define usb_string_attr(name) \
|
||||
static ssize_t show_##name(struct device *dev, char *buf) \
|
||||
static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \
|
||||
{ \
|
||||
struct usb_device *udev; \
|
||||
int len; \
|
||||
@@ -107,7 +107,7 @@ usb_string_attr(manufacturer);
|
||||
usb_string_attr(serial);
|
||||
|
||||
static ssize_t
|
||||
show_speed (struct device *dev, char *buf)
|
||||
show_speed (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_device *udev;
|
||||
char *speed;
|
||||
@@ -133,7 +133,7 @@ show_speed (struct device *dev, char *buf)
|
||||
static DEVICE_ATTR(speed, S_IRUGO, show_speed, NULL);
|
||||
|
||||
static ssize_t
|
||||
show_devnum (struct device *dev, char *buf)
|
||||
show_devnum (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_device *udev;
|
||||
|
||||
@@ -143,7 +143,7 @@ show_devnum (struct device *dev, char *buf)
|
||||
static DEVICE_ATTR(devnum, S_IRUGO, show_devnum, NULL);
|
||||
|
||||
static ssize_t
|
||||
show_version (struct device *dev, char *buf)
|
||||
show_version (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_device *udev;
|
||||
u16 bcdUSB;
|
||||
@@ -155,7 +155,7 @@ show_version (struct device *dev, char *buf)
|
||||
static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
|
||||
|
||||
static ssize_t
|
||||
show_maxchild (struct device *dev, char *buf)
|
||||
show_maxchild (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_device *udev;
|
||||
|
||||
@@ -167,7 +167,7 @@ static DEVICE_ATTR(maxchild, S_IRUGO, show_maxchild, NULL);
|
||||
/* Descriptor fields */
|
||||
#define usb_descriptor_attr_le16(field, format_string) \
|
||||
static ssize_t \
|
||||
show_##field (struct device *dev, char *buf) \
|
||||
show_##field (struct device *dev, struct device_attribute *attr, char *buf) \
|
||||
{ \
|
||||
struct usb_device *udev; \
|
||||
\
|
||||
@@ -183,7 +183,7 @@ usb_descriptor_attr_le16(bcdDevice, "%04x\n")
|
||||
|
||||
#define usb_descriptor_attr(field, format_string) \
|
||||
static ssize_t \
|
||||
show_##field (struct device *dev, char *buf) \
|
||||
show_##field (struct device *dev, struct device_attribute *attr, char *buf) \
|
||||
{ \
|
||||
struct usb_device *udev; \
|
||||
\
|
||||
@@ -254,7 +254,7 @@ void usb_remove_sysfs_dev_files (struct usb_device *udev)
|
||||
/* Interface fields */
|
||||
#define usb_intf_attr(field, format_string) \
|
||||
static ssize_t \
|
||||
show_##field (struct device *dev, char *buf) \
|
||||
show_##field (struct device *dev, struct device_attribute *attr, char *buf) \
|
||||
{ \
|
||||
struct usb_interface *intf = to_usb_interface (dev); \
|
||||
\
|
||||
@@ -269,7 +269,7 @@ usb_intf_attr (bInterfaceClass, "%02x\n")
|
||||
usb_intf_attr (bInterfaceSubClass, "%02x\n")
|
||||
usb_intf_attr (bInterfaceProtocol, "%02x\n")
|
||||
|
||||
static ssize_t show_interface_string(struct device *dev, char *buf)
|
||||
static ssize_t show_interface_string(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_interface *intf;
|
||||
struct usb_device *udev;
|
||||
|
@@ -633,7 +633,7 @@ static const struct usb_gadget_ops dummy_ops = {
|
||||
|
||||
/* "function" sysfs attribute */
|
||||
static ssize_t
|
||||
show_function (struct device *dev, char *buf)
|
||||
show_function (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct dummy *dum = gadget_dev_to_dummy (dev);
|
||||
|
||||
@@ -1600,7 +1600,7 @@ show_urb (char *buf, size_t size, struct urb *urb)
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
show_urbs (struct device *dev, char *buf)
|
||||
show_urbs (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_hcd *hcd = dev_get_drvdata (dev);
|
||||
struct dummy *dum = hcd_to_dummy (hcd);
|
||||
|
@@ -3554,14 +3554,14 @@ static void close_all_backing_files(struct fsg_dev *fsg)
|
||||
}
|
||||
|
||||
|
||||
static ssize_t show_ro(struct device *dev, char *buf)
|
||||
static ssize_t show_ro(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct lun *curlun = dev_to_lun(dev);
|
||||
|
||||
return sprintf(buf, "%d\n", curlun->ro);
|
||||
}
|
||||
|
||||
static ssize_t show_file(struct device *dev, char *buf)
|
||||
static ssize_t show_file(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct lun *curlun = dev_to_lun(dev);
|
||||
struct fsg_dev *fsg = (struct fsg_dev *) dev_get_drvdata(dev);
|
||||
@@ -3589,7 +3589,7 @@ static ssize_t show_file(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
|
||||
static ssize_t store_ro(struct device *dev, const char *buf, size_t count)
|
||||
static ssize_t store_ro(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
|
||||
{
|
||||
ssize_t rc = count;
|
||||
struct lun *curlun = dev_to_lun(dev);
|
||||
@@ -3613,7 +3613,7 @@ static ssize_t store_ro(struct device *dev, const char *buf, size_t count)
|
||||
return rc;
|
||||
}
|
||||
|
||||
static ssize_t store_file(struct device *dev, const char *buf, size_t count)
|
||||
static ssize_t store_file(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
|
||||
{
|
||||
struct lun *curlun = dev_to_lun(dev);
|
||||
struct fsg_dev *fsg = (struct fsg_dev *) dev_get_drvdata(dev);
|
||||
|
@@ -1469,7 +1469,7 @@ static const struct usb_gadget_ops net2280_ops = {
|
||||
|
||||
/* "function" sysfs attribute */
|
||||
static ssize_t
|
||||
show_function (struct device *_dev, char *buf)
|
||||
show_function (struct device *_dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct net2280 *dev = dev_get_drvdata (_dev);
|
||||
|
||||
@@ -1482,7 +1482,7 @@ show_function (struct device *_dev, char *buf)
|
||||
static DEVICE_ATTR (function, S_IRUGO, show_function, NULL);
|
||||
|
||||
static ssize_t
|
||||
show_registers (struct device *_dev, char *buf)
|
||||
show_registers (struct device *_dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct net2280 *dev;
|
||||
char *next;
|
||||
@@ -1637,7 +1637,7 @@ show_registers (struct device *_dev, char *buf)
|
||||
static DEVICE_ATTR (registers, S_IRUGO, show_registers, NULL);
|
||||
|
||||
static ssize_t
|
||||
show_queues (struct device *_dev, char *buf)
|
||||
show_queues (struct device *_dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct net2280 *dev;
|
||||
char *next;
|
||||
|
@@ -1429,7 +1429,7 @@ done:
|
||||
|
||||
/* "function" sysfs attribute */
|
||||
static ssize_t
|
||||
show_function (struct device *_dev, char *buf)
|
||||
show_function (struct device *_dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct pxa2xx_udc *dev = dev_get_drvdata (_dev);
|
||||
|
||||
|
Referência em uma nova issue
Block a user