[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>
This commit is contained in:

gecommit door
Greg Kroah-Hartman

bovenliggende
3fd3c0a5f5
commit
10523b3b82
@@ -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);
|
||||
|
||||
|
Verwijs in nieuw issue
Block a user