Skip to content

L
linux
Commit 060b8845 authored by Yani Ioannou's avatar Yani Ioannou Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] Driver Core: drivers/usb/input/aiptek.c - drivers/zorro/zorro-sysfs.c:... 

[PATCH] Driver Core: drivers/usb/input/aiptek.c - drivers/zorro/zorro-sysfs.c: update device attribute callbacks
Signed-off-by: default avatarYani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 10523b3b
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 93 deletions
drivers/usb/input/aiptek.c
View file @ 060b8845
...@@ -1025,7 +1025,7 @@ static int aiptek_program_tablet(struct aiptek *aiptek) ...@@ -1025,7 +1025,7 @@ static int aiptek_program_tablet(struct aiptek *aiptek)
/*********************************************************************** /***********************************************************************
* support the 'size' file -- display support * support the 'size' file -- display support
*/ */
static ssize_t show_tabletSize(struct device *dev, char *buf) static ssize_t show_tabletSize(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1048,7 +1048,7 @@ static DEVICE_ATTR(size, S_IRUGO, show_tabletSize, NULL); ...@@ -1048,7 +1048,7 @@ static DEVICE_ATTR(size, S_IRUGO, show_tabletSize, NULL);
/*********************************************************************** /***********************************************************************
* support routines for the 'product_id' file * support routines for the 'product_id' file
*/ */
static ssize_t show_tabletProductId(struct device *dev, char *buf) static ssize_t show_tabletProductId(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1064,7 +1064,7 @@ static DEVICE_ATTR(product_id, S_IRUGO, show_tabletProductId, NULL); ...@@ -1064,7 +1064,7 @@ static DEVICE_ATTR(product_id, S_IRUGO, show_tabletProductId, NULL);
/*********************************************************************** /***********************************************************************
* support routines for the 'vendor_id' file * support routines for the 'vendor_id' file
*/ */
static ssize_t show_tabletVendorId(struct device *dev, char *buf) static ssize_t show_tabletVendorId(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1079,7 +1079,7 @@ static DEVICE_ATTR(vendor_id, S_IRUGO, show_tabletVendorId, NULL); ...@@ -1079,7 +1079,7 @@ static DEVICE_ATTR(vendor_id, S_IRUGO, show_tabletVendorId, NULL);
/*********************************************************************** /***********************************************************************
* support routines for the 'vendor' file * support routines for the 'vendor' file
*/ */
static ssize_t show_tabletManufacturer(struct device *dev, char *buf) static ssize_t show_tabletManufacturer(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
int retval; int retval;
...@@ -1096,7 +1096,7 @@ static DEVICE_ATTR(vendor, S_IRUGO, show_tabletManufacturer, NULL); ...@@ -1096,7 +1096,7 @@ static DEVICE_ATTR(vendor, S_IRUGO, show_tabletManufacturer, NULL);
/*********************************************************************** /***********************************************************************
* support routines for the 'product' file * support routines for the 'product' file
*/ */
static ssize_t show_tabletProduct(struct device *dev, char *buf) static ssize_t show_tabletProduct(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
int retval; int retval;
...@@ -1114,7 +1114,7 @@ static DEVICE_ATTR(product, S_IRUGO, show_tabletProduct, NULL); ...@@ -1114,7 +1114,7 @@ static DEVICE_ATTR(product, S_IRUGO, show_tabletProduct, NULL);
* support routines for the 'pointer_mode' file. Note that this file * support routines for the 'pointer_mode' file. Note that this file
* both displays current setting and allows reprogramming. * both displays current setting and allows reprogramming.
*/ */
static ssize_t show_tabletPointerMode(struct device *dev, char *buf) static ssize_t show_tabletPointerMode(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
char *s; char *s;
...@@ -1143,7 +1143,7 @@ static ssize_t show_tabletPointerMode(struct device *dev, char *buf) ...@@ -1143,7 +1143,7 @@ static ssize_t show_tabletPointerMode(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletPointerMode(struct device *dev, const char *buf, size_t count) store_tabletPointerMode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
if (aiptek == NULL) if (aiptek == NULL)
...@@ -1168,7 +1168,7 @@ static DEVICE_ATTR(pointer_mode, ...@@ -1168,7 +1168,7 @@ static DEVICE_ATTR(pointer_mode,
* support routines for the 'coordinate_mode' file. Note that this file * support routines for the 'coordinate_mode' file. Note that this file
* both displays current setting and allows reprogramming. * both displays current setting and allows reprogramming.
*/ */
static ssize_t show_tabletCoordinateMode(struct device *dev, char *buf) static ssize_t show_tabletCoordinateMode(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
char *s; char *s;
...@@ -1193,7 +1193,7 @@ static ssize_t show_tabletCoordinateMode(struct device *dev, char *buf) ...@@ -1193,7 +1193,7 @@ static ssize_t show_tabletCoordinateMode(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletCoordinateMode(struct device *dev, const char *buf, size_t count) store_tabletCoordinateMode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
if (aiptek == NULL) if (aiptek == NULL)
...@@ -1217,7 +1217,7 @@ static DEVICE_ATTR(coordinate_mode, ...@@ -1217,7 +1217,7 @@ static DEVICE_ATTR(coordinate_mode,
* support routines for the 'tool_mode' file. Note that this file * support routines for the 'tool_mode' file. Note that this file
* both displays current setting and allows reprogramming. * both displays current setting and allows reprogramming.
*/ */
static ssize_t show_tabletToolMode(struct device *dev, char *buf) static ssize_t show_tabletToolMode(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
char *s; char *s;
...@@ -1262,7 +1262,7 @@ static ssize_t show_tabletToolMode(struct device *dev, char *buf) ...@@ -1262,7 +1262,7 @@ static ssize_t show_tabletToolMode(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletToolMode(struct device *dev, const char *buf, size_t count) store_tabletToolMode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
if (aiptek == NULL) if (aiptek == NULL)
...@@ -1295,7 +1295,7 @@ static DEVICE_ATTR(tool_mode, ...@@ -1295,7 +1295,7 @@ static DEVICE_ATTR(tool_mode,
* support routines for the 'xtilt' file. Note that this file * support routines for the 'xtilt' file. Note that this file
* both displays current setting and allows reprogramming. * both displays current setting and allows reprogramming.
*/ */
static ssize_t show_tabletXtilt(struct device *dev, char *buf) static ssize_t show_tabletXtilt(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1311,7 +1311,7 @@ static ssize_t show_tabletXtilt(struct device *dev, char *buf) ...@@ -1311,7 +1311,7 @@ static ssize_t show_tabletXtilt(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletXtilt(struct device *dev, const char *buf, size_t count) store_tabletXtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
int x; int x;
...@@ -1337,7 +1337,7 @@ static DEVICE_ATTR(xtilt, ...@@ -1337,7 +1337,7 @@ static DEVICE_ATTR(xtilt,
* support routines for the 'ytilt' file. Note that this file * support routines for the 'ytilt' file. Note that this file
* both displays current setting and allows reprogramming. * both displays current setting and allows reprogramming.
*/ */
static ssize_t show_tabletYtilt(struct device *dev, char *buf) static ssize_t show_tabletYtilt(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1353,7 +1353,7 @@ static ssize_t show_tabletYtilt(struct device *dev, char *buf) ...@@ -1353,7 +1353,7 @@ static ssize_t show_tabletYtilt(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletYtilt(struct device *dev, const char *buf, size_t count) store_tabletYtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
int y; int y;
...@@ -1379,7 +1379,7 @@ static DEVICE_ATTR(ytilt, ...@@ -1379,7 +1379,7 @@ static DEVICE_ATTR(ytilt,
* support routines for the 'jitter' file. Note that this file * support routines for the 'jitter' file. Note that this file
* both displays current setting and allows reprogramming. * both displays current setting and allows reprogramming.
*/ */
static ssize_t show_tabletJitterDelay(struct device *dev, char *buf) static ssize_t show_tabletJitterDelay(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1390,7 +1390,7 @@ static ssize_t show_tabletJitterDelay(struct device *dev, char *buf) ...@@ -1390,7 +1390,7 @@ static ssize_t show_tabletJitterDelay(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletJitterDelay(struct device *dev, const char *buf, size_t count) store_tabletJitterDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1409,7 +1409,7 @@ static DEVICE_ATTR(jitter, ...@@ -1409,7 +1409,7 @@ static DEVICE_ATTR(jitter,
* support routines for the 'delay' file. Note that this file * support routines for the 'delay' file. Note that this file
* both displays current setting and allows reprogramming. * both displays current setting and allows reprogramming.
*/ */
static ssize_t show_tabletProgrammableDelay(struct device *dev, char *buf) static ssize_t show_tabletProgrammableDelay(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1421,7 +1421,7 @@ static ssize_t show_tabletProgrammableDelay(struct device *dev, char *buf) ...@@ -1421,7 +1421,7 @@ static ssize_t show_tabletProgrammableDelay(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletProgrammableDelay(struct device *dev, const char *buf, size_t count) store_tabletProgrammableDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1440,7 +1440,7 @@ static DEVICE_ATTR(delay, ...@@ -1440,7 +1440,7 @@ static DEVICE_ATTR(delay,
* support routines for the 'input_path' file. Note that this file * support routines for the 'input_path' file. Note that this file
* only displays current setting. * only displays current setting.
*/ */
static ssize_t show_tabletInputDevice(struct device *dev, char *buf) static ssize_t show_tabletInputDevice(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1457,7 +1457,7 @@ static DEVICE_ATTR(input_path, S_IRUGO, show_tabletInputDevice, NULL); ...@@ -1457,7 +1457,7 @@ static DEVICE_ATTR(input_path, S_IRUGO, show_tabletInputDevice, NULL);
* support routines for the 'event_count' file. Note that this file * support routines for the 'event_count' file. Note that this file
* only displays current setting. * only displays current setting.
*/ */
static ssize_t show_tabletEventsReceived(struct device *dev, char *buf) static ssize_t show_tabletEventsReceived(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1473,7 +1473,7 @@ static DEVICE_ATTR(event_count, S_IRUGO, show_tabletEventsReceived, NULL); ...@@ -1473,7 +1473,7 @@ static DEVICE_ATTR(event_count, S_IRUGO, show_tabletEventsReceived, NULL);
* support routines for the 'diagnostic' file. Note that this file * support routines for the 'diagnostic' file. Note that this file
* only displays current setting. * only displays current setting.
*/ */
static ssize_t show_tabletDiagnosticMessage(struct device *dev, char *buf) static ssize_t show_tabletDiagnosticMessage(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
char *retMsg; char *retMsg;
...@@ -1515,7 +1515,7 @@ static DEVICE_ATTR(diagnostic, S_IRUGO, show_tabletDiagnosticMessage, NULL); ...@@ -1515,7 +1515,7 @@ static DEVICE_ATTR(diagnostic, S_IRUGO, show_tabletDiagnosticMessage, NULL);
* support routines for the 'stylus_upper' file. Note that this file * support routines for the 'stylus_upper' file. Note that this file
* both displays current setting and allows for setting changing. * both displays current setting and allows for setting changing.
*/ */
static ssize_t show_tabletStylusUpper(struct device *dev, char *buf) static ssize_t show_tabletStylusUpper(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
char *s; char *s;
...@@ -1540,7 +1540,7 @@ static ssize_t show_tabletStylusUpper(struct device *dev, char *buf) ...@@ -1540,7 +1540,7 @@ static ssize_t show_tabletStylusUpper(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletStylusUpper(struct device *dev, const char *buf, size_t count) store_tabletStylusUpper(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1565,7 +1565,7 @@ static DEVICE_ATTR(stylus_upper, ...@@ -1565,7 +1565,7 @@ static DEVICE_ATTR(stylus_upper,
* support routines for the 'stylus_lower' file. Note that this file * support routines for the 'stylus_lower' file. Note that this file
* both displays current setting and allows for setting changing. * both displays current setting and allows for setting changing.
*/ */
static ssize_t show_tabletStylusLower(struct device *dev, char *buf) static ssize_t show_tabletStylusLower(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
char *s; char *s;
...@@ -1590,7 +1590,7 @@ static ssize_t show_tabletStylusLower(struct device *dev, char *buf) ...@@ -1590,7 +1590,7 @@ static ssize_t show_tabletStylusLower(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletStylusLower(struct device *dev, const char *buf, size_t count) store_tabletStylusLower(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1615,7 +1615,7 @@ static DEVICE_ATTR(stylus_lower, ...@@ -1615,7 +1615,7 @@ static DEVICE_ATTR(stylus_lower,
* support routines for the 'mouse_left' file. Note that this file * support routines for the 'mouse_left' file. Note that this file
* both displays current setting and allows for setting changing. * both displays current setting and allows for setting changing.
*/ */
static ssize_t show_tabletMouseLeft(struct device *dev, char *buf) static ssize_t show_tabletMouseLeft(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
char *s; char *s;
...@@ -1644,7 +1644,7 @@ static ssize_t show_tabletMouseLeft(struct device *dev, char *buf) ...@@ -1644,7 +1644,7 @@ static ssize_t show_tabletMouseLeft(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletMouseLeft(struct device *dev, const char *buf, size_t count) store_tabletMouseLeft(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1669,7 +1669,7 @@ static DEVICE_ATTR(mouse_left, ...@@ -1669,7 +1669,7 @@ static DEVICE_ATTR(mouse_left,
* support routines for the 'mouse_middle' file. Note that this file * support routines for the 'mouse_middle' file. Note that this file
* both displays current setting and allows for setting changing. * both displays current setting and allows for setting changing.
*/ */
static ssize_t show_tabletMouseMiddle(struct device *dev, char *buf) static ssize_t show_tabletMouseMiddle(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
char *s; char *s;
...@@ -1698,7 +1698,7 @@ static ssize_t show_tabletMouseMiddle(struct device *dev, char *buf) ...@@ -1698,7 +1698,7 @@ static ssize_t show_tabletMouseMiddle(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletMouseMiddle(struct device *dev, const char *buf, size_t count) store_tabletMouseMiddle(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1725,7 +1725,7 @@ static DEVICE_ATTR(mouse_middle, ...@@ -1725,7 +1725,7 @@ static DEVICE_ATTR(mouse_middle,
* support routines for the 'mouse_right' file. Note that this file * support routines for the 'mouse_right' file. Note that this file
* both displays current setting and allows for setting changing. * both displays current setting and allows for setting changing.
*/ */
static ssize_t show_tabletMouseRight(struct device *dev, char *buf) static ssize_t show_tabletMouseRight(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
char *s; char *s;
...@@ -1754,7 +1754,7 @@ static ssize_t show_tabletMouseRight(struct device *dev, char *buf) ...@@ -1754,7 +1754,7 @@ static ssize_t show_tabletMouseRight(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletMouseRight(struct device *dev, const char *buf, size_t count) store_tabletMouseRight(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1780,7 +1780,7 @@ static DEVICE_ATTR(mouse_right, ...@@ -1780,7 +1780,7 @@ static DEVICE_ATTR(mouse_right,
* support routines for the 'wheel' file. Note that this file * support routines for the 'wheel' file. Note that this file
* both displays current setting and allows for setting changing. * both displays current setting and allows for setting changing.
*/ */
static ssize_t show_tabletWheel(struct device *dev, char *buf) static ssize_t show_tabletWheel(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1796,7 +1796,7 @@ static ssize_t show_tabletWheel(struct device *dev, char *buf) ...@@ -1796,7 +1796,7 @@ static ssize_t show_tabletWheel(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletWheel(struct device *dev, const char *buf, size_t count) store_tabletWheel(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1814,7 +1814,7 @@ static DEVICE_ATTR(wheel, ...@@ -1814,7 +1814,7 @@ static DEVICE_ATTR(wheel,
* support routines for the 'execute' file. Note that this file * support routines for the 'execute' file. Note that this file
* both displays current setting and allows for setting changing. * both displays current setting and allows for setting changing.
*/ */
static ssize_t show_tabletExecute(struct device *dev, char *buf) static ssize_t show_tabletExecute(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1829,7 +1829,7 @@ static ssize_t show_tabletExecute(struct device *dev, char *buf) ...@@ -1829,7 +1829,7 @@ static ssize_t show_tabletExecute(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
store_tabletExecute(struct device *dev, const char *buf, size_t count) store_tabletExecute(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1855,7 +1855,7 @@ static DEVICE_ATTR(execute, ...@@ -1855,7 +1855,7 @@ static DEVICE_ATTR(execute,
* support routines for the 'odm_code' file. Note that this file * support routines for the 'odm_code' file. Note that this file
* only displays current setting. * only displays current setting.
*/ */
static ssize_t show_tabletODMCode(struct device *dev, char *buf) static ssize_t show_tabletODMCode(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1871,7 +1871,7 @@ static DEVICE_ATTR(odm_code, S_IRUGO, show_tabletODMCode, NULL); ...@@ -1871,7 +1871,7 @@ static DEVICE_ATTR(odm_code, S_IRUGO, show_tabletODMCode, NULL);
* support routines for the 'model_code' file. Note that this file * support routines for the 'model_code' file. Note that this file
* only displays current setting. * only displays current setting.
*/ */
static ssize_t show_tabletModelCode(struct device *dev, char *buf) static ssize_t show_tabletModelCode(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
...@@ -1887,7 +1887,7 @@ static DEVICE_ATTR(model_code, S_IRUGO, show_tabletModelCode, NULL); ...@@ -1887,7 +1887,7 @@ static DEVICE_ATTR(model_code, S_IRUGO, show_tabletModelCode, NULL);
* support routines for the 'firmware_code' file. Note that this file * support routines for the 'firmware_code' file. Note that this file
* only displays current setting. * only displays current setting.
*/ */
static ssize_t show_firmwareCode(struct device *dev, char *buf) static ssize_t show_firmwareCode(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct aiptek *aiptek = dev_get_drvdata(dev); struct aiptek *aiptek = dev_get_drvdata(dev);
......
drivers/usb/misc/cytherm.c
View file @ 060b8845
...@@ -85,7 +85,7 @@ static int vendor_command(struct usb_device *dev, unsigned char request, ...@@ -85,7 +85,7 @@ static int vendor_command(struct usb_device *dev, unsigned char request,
#define BRIGHTNESS 0x2c /* RAM location for brightness value */ #define BRIGHTNESS 0x2c /* RAM location for brightness value */
#define BRIGHTNESS_SEM 0x2b /* RAM location for brightness semaphore */ #define BRIGHTNESS_SEM 0x2b /* RAM location for brightness semaphore */
static ssize_t show_brightness(struct device *dev, char *buf) static ssize_t show_brightness(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
struct usb_cytherm *cytherm = usb_get_intfdata(intf); struct usb_cytherm *cytherm = usb_get_intfdata(intf);
...@@ -93,7 +93,7 @@ static ssize_t show_brightness(struct device *dev, char *buf) ...@@ -93,7 +93,7 @@ static ssize_t show_brightness(struct device *dev, char *buf)
return sprintf(buf, "%i", cytherm->brightness); return sprintf(buf, "%i", cytherm->brightness);
} }
static ssize_t set_brightness(struct device *dev, const char *buf, static ssize_t set_brightness(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
...@@ -138,7 +138,7 @@ static DEVICE_ATTR(brightness, S_IRUGO | S_IWUSR | S_IWGRP, ...@@ -138,7 +138,7 @@ static DEVICE_ATTR(brightness, S_IRUGO | S_IWUSR | S_IWGRP,
#define TEMP 0x33 /* RAM location for temperature */ #define TEMP 0x33 /* RAM location for temperature */
#define SIGN 0x34 /* RAM location for temperature sign */ #define SIGN 0x34 /* RAM location for temperature sign */
static ssize_t show_temp(struct device *dev, char *buf) static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
...@@ -174,7 +174,7 @@ static ssize_t show_temp(struct device *dev, char *buf) ...@@ -174,7 +174,7 @@ static ssize_t show_temp(struct device *dev, char *buf)
} }
static ssize_t set_temp(struct device *dev, const char *buf, size_t count) static ssize_t set_temp(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
return count; return count;
} }
...@@ -184,7 +184,7 @@ static DEVICE_ATTR(temp, S_IRUGO, show_temp, set_temp); ...@@ -184,7 +184,7 @@ static DEVICE_ATTR(temp, S_IRUGO, show_temp, set_temp);
#define BUTTON 0x7a #define BUTTON 0x7a
static ssize_t show_button(struct device *dev, char *buf) static ssize_t show_button(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
...@@ -215,7 +215,7 @@ static ssize_t show_button(struct device *dev, char *buf) ...@@ -215,7 +215,7 @@ static ssize_t show_button(struct device *dev, char *buf)
} }
static ssize_t set_button(struct device *dev, const char *buf, size_t count) static ssize_t set_button(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
return count; return count;
} }
...@@ -223,7 +223,7 @@ static ssize_t set_button(struct device *dev, const char *buf, size_t count) ...@@ -223,7 +223,7 @@ static ssize_t set_button(struct device *dev, const char *buf, size_t count)
static DEVICE_ATTR(button, S_IRUGO, show_button, set_button); static DEVICE_ATTR(button, S_IRUGO, show_button, set_button);
static ssize_t show_port0(struct device *dev, char *buf) static ssize_t show_port0(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
struct usb_cytherm *cytherm = usb_get_intfdata(intf); struct usb_cytherm *cytherm = usb_get_intfdata(intf);
...@@ -249,7 +249,7 @@ static ssize_t show_port0(struct device *dev, char *buf) ...@@ -249,7 +249,7 @@ static ssize_t show_port0(struct device *dev, char *buf)
} }
static ssize_t set_port0(struct device *dev, const char *buf, size_t count) static ssize_t set_port0(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
struct usb_cytherm *cytherm = usb_get_intfdata(intf); struct usb_cytherm *cytherm = usb_get_intfdata(intf);
...@@ -283,7 +283,7 @@ static ssize_t set_port0(struct device *dev, const char *buf, size_t count) ...@@ -283,7 +283,7 @@ static ssize_t set_port0(struct device *dev, const char *buf, size_t count)
static DEVICE_ATTR(port0, S_IRUGO | S_IWUSR | S_IWGRP, show_port0, set_port0); static DEVICE_ATTR(port0, S_IRUGO | S_IWUSR | S_IWGRP, show_port0, set_port0);
static ssize_t show_port1(struct device *dev, char *buf) static ssize_t show_port1(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
struct usb_cytherm *cytherm = usb_get_intfdata(intf); struct usb_cytherm *cytherm = usb_get_intfdata(intf);
...@@ -309,7 +309,7 @@ static ssize_t show_port1(struct device *dev, char *buf) ...@@ -309,7 +309,7 @@ static ssize_t show_port1(struct device *dev, char *buf)
} }
static ssize_t set_port1(struct device *dev, const char *buf, size_t count) static ssize_t set_port1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
struct usb_cytherm *cytherm = usb_get_intfdata(intf); struct usb_cytherm *cytherm = usb_get_intfdata(intf);
......
drivers/usb/misc/phidgetkit.c
View file @ 060b8845
...@@ -173,7 +173,7 @@ static int change_string(struct phidget_interfacekit *kit, const char *display, ...@@ -173,7 +173,7 @@ static int change_string(struct phidget_interfacekit *kit, const char *display,
} }
#define set_lcd_line(number) \ #define set_lcd_line(number) \
static ssize_t lcd_line_##number(struct device *dev, const char *buf, size_t count) \ static ssize_t lcd_line_##number(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
{ \ { \
struct usb_interface *intf = to_usb_interface(dev); \ struct usb_interface *intf = to_usb_interface(dev); \
struct phidget_interfacekit *kit = usb_get_intfdata(intf); \ struct phidget_interfacekit *kit = usb_get_intfdata(intf); \
...@@ -184,7 +184,7 @@ static DEVICE_ATTR(lcd_line_##number, S_IWUGO, NULL, lcd_line_##number); ...@@ -184,7 +184,7 @@ static DEVICE_ATTR(lcd_line_##number, S_IWUGO, NULL, lcd_line_##number);
set_lcd_line(1); set_lcd_line(1);
set_lcd_line(2); set_lcd_line(2);
static ssize_t set_backlight(struct device *dev, const char *buf, size_t count) static ssize_t set_backlight(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
struct phidget_interfacekit *kit = usb_get_intfdata(intf); struct phidget_interfacekit *kit = usb_get_intfdata(intf);
...@@ -232,7 +232,7 @@ static void remove_lcd_files(struct phidget_interfacekit *kit) ...@@ -232,7 +232,7 @@ static void remove_lcd_files(struct phidget_interfacekit *kit)
} }
} }
static ssize_t enable_lcd_files(struct device *dev, const char *buf, size_t count) static ssize_t enable_lcd_files(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
struct phidget_interfacekit *kit = usb_get_intfdata(intf); struct phidget_interfacekit *kit = usb_get_intfdata(intf);
...@@ -307,7 +307,7 @@ static void interfacekit_irq(struct urb *urb, struct pt_regs *regs) ...@@ -307,7 +307,7 @@ static void interfacekit_irq(struct urb *urb, struct pt_regs *regs)
} }
#define show_set_output(value) \ #define show_set_output(value) \
static ssize_t set_output##value(struct device *dev, const char *buf, \ static ssize_t set_output##value(struct device *dev, struct device_attribute *attr, const char *buf, \
size_t count) \ size_t count) \
{ \ { \
struct usb_interface *intf = to_usb_interface(dev); \ struct usb_interface *intf = to_usb_interface(dev); \
...@@ -324,7 +324,7 @@ static ssize_t set_output##value(struct device *dev, const char *buf, \ ...@@ -324,7 +324,7 @@ static ssize_t set_output##value(struct device *dev, const char *buf, \
return retval ? retval : count; \ return retval ? retval : count; \
} \ } \
\ \
static ssize_t show_output##value(struct device *dev, char *buf) \ static ssize_t show_output##value(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct usb_interface *intf = to_usb_interface(dev); \ struct usb_interface *intf = to_usb_interface(dev); \
struct phidget_interfacekit *kit = usb_get_intfdata(intf); \ struct phidget_interfacekit *kit = usb_get_intfdata(intf); \
...@@ -343,7 +343,7 @@ show_set_output(7); ...@@ -343,7 +343,7 @@ show_set_output(7);
show_set_output(8); /* should be MAX_INTERFACES - 1 */ show_set_output(8); /* should be MAX_INTERFACES - 1 */
#define show_input(value) \ #define show_input(value) \
static ssize_t show_input##value(struct device *dev, char *buf) \ static ssize_t show_input##value(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct usb_interface *intf = to_usb_interface(dev); \ struct usb_interface *intf = to_usb_interface(dev); \
struct phidget_interfacekit *kit = usb_get_intfdata(intf); \ struct phidget_interfacekit *kit = usb_get_intfdata(intf); \
...@@ -362,7 +362,7 @@ show_input(7); ...@@ -362,7 +362,7 @@ show_input(7);
show_input(8); /* should be MAX_INTERFACES - 1 */ show_input(8); /* should be MAX_INTERFACES - 1 */
#define show_sensor(value) \ #define show_sensor(value) \
static ssize_t show_sensor##value(struct device *dev, char *buf) \ static ssize_t show_sensor##value(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct usb_interface *intf = to_usb_interface(dev); \ struct usb_interface *intf = to_usb_interface(dev); \
struct phidget_interfacekit *kit = usb_get_intfdata(intf); \ struct phidget_interfacekit *kit = usb_get_intfdata(intf); \
......
drivers/usb/misc/phidgetservo.c
View file @ 060b8845
...@@ -207,7 +207,7 @@ change_position_v20(struct phidget_servo *servo, int servo_no, int degrees, ...@@ -207,7 +207,7 @@ change_position_v20(struct phidget_servo *servo, int servo_no, int degrees,
} }
#define show_set(value) \ #define show_set(value) \
static ssize_t set_servo##value (struct device *dev, \ static ssize_t set_servo##value (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
int degrees, minutes, retval; \ int degrees, minutes, retval; \
...@@ -233,7 +233,7 @@ static ssize_t set_servo##value (struct device *dev, \ ...@@ -233,7 +233,7 @@ static ssize_t set_servo##value (struct device *dev, \
return retval < 0 ? retval : count; \ return retval < 0 ? retval : count; \
} \ } \
\ \
static ssize_t show_servo##value (struct device *dev, char *buf) \ static ssize_t show_servo##value (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct usb_interface *intf = to_usb_interface (dev); \ struct usb_interface *intf = to_usb_interface (dev); \
struct phidget_servo *servo = usb_get_intfdata (intf); \ struct phidget_servo *servo = usb_get_intfdata (intf); \
......
drivers/usb/misc/usbled.c
View file @ 060b8845
...@@ -81,14 +81,14 @@ static void change_color(struct usb_led *led) ...@@ -81,14 +81,14 @@ static void change_color(struct usb_led *led)
} }
#define show_set(value) \ #define show_set(value) \
static ssize_t show_##value(struct device *dev, char *buf) \ static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct usb_interface *intf = to_usb_interface(dev); \ struct usb_interface *intf = to_usb_interface(dev); \
struct usb_led *led = usb_get_intfdata(intf); \ struct usb_led *led = usb_get_intfdata(intf); \
\ \
return sprintf(buf, "%d\n", led->value); \ return sprintf(buf, "%d\n", led->value); \
} \ } \
static ssize_t set_##value(struct device *dev, const char *buf, size_t count) \ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
{ \ { \
struct usb_interface *intf = to_usb_interface(dev); \ struct usb_interface *intf = to_usb_interface(dev); \
struct usb_led *led = usb_get_intfdata(intf); \ struct usb_led *led = usb_get_intfdata(intf); \
......
drivers/usb/serial/ftdi_sio.c
View file @ 060b8845
...@@ -1218,7 +1218,7 @@ static int set_serial_info(struct usb_serial_port * port, struct serial_struct _ ...@@ -1218,7 +1218,7 @@ static int set_serial_info(struct usb_serial_port * port, struct serial_struct _
* *************************************************************************** * ***************************************************************************
*/ */
static ssize_t show_latency_timer(struct device *dev, char *buf) static ssize_t show_latency_timer(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct usb_serial_port *port = to_usb_serial_port(dev); struct usb_serial_port *port = to_usb_serial_port(dev);
struct ftdi_private *priv = usb_get_serial_port_data(port); struct ftdi_private *priv = usb_get_serial_port_data(port);
...@@ -1245,7 +1245,7 @@ static ssize_t show_latency_timer(struct device *dev, char *buf) ...@@ -1245,7 +1245,7 @@ static ssize_t show_latency_timer(struct device *dev, char *buf)
} }
/* Write a new value of the latency timer, in units of milliseconds. */ /* Write a new value of the latency timer, in units of milliseconds. */
static ssize_t store_latency_timer(struct device *dev, const char *valbuf, static ssize_t store_latency_timer(struct device *dev, struct device_attribute *attr, const char *valbuf,
size_t count) size_t count)
{ {
struct usb_serial_port *port = to_usb_serial_port(dev); struct usb_serial_port *port = to_usb_serial_port(dev);
...@@ -1276,7 +1276,7 @@ static ssize_t store_latency_timer(struct device *dev, const char *valbuf, ...@@ -1276,7 +1276,7 @@ static ssize_t store_latency_timer(struct device *dev, const char *valbuf,
/* Write an event character directly to the FTDI register. The ASCII /* Write an event character directly to the FTDI register. The ASCII
value is in the low 8 bits, with the enable bit in the 9th bit. */ value is in the low 8 bits, with the enable bit in the 9th bit. */
static ssize_t store_event_char(struct device *dev, const char *valbuf, static ssize_t store_event_char(struct device *dev, struct device_attribute *attr, const char *valbuf,
size_t count) size_t count)
{ {
struct usb_serial_port *port = to_usb_serial_port(dev); struct usb_serial_port *port = to_usb_serial_port(dev);
......
drivers/usb/storage/scsiglue.c
View file @ 060b8845
...@@ -398,7 +398,7 @@ US_DO_ALL_FLAGS ...@@ -398,7 +398,7 @@ US_DO_ALL_FLAGS
***********************************************************************/ ***********************************************************************/
/* Output routine for the sysfs max_sectors file */ /* Output routine for the sysfs max_sectors file */
static ssize_t show_max_sectors(struct device *dev, char *buf) static ssize_t show_max_sectors(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct scsi_device *sdev = to_scsi_device(dev); struct scsi_device *sdev = to_scsi_device(dev);
...@@ -406,7 +406,7 @@ static ssize_t show_max_sectors(struct device *dev, char *buf) ...@@ -406,7 +406,7 @@ static ssize_t show_max_sectors(struct device *dev, char *buf)
} }
/* Input routine for the sysfs max_sectors file */ /* Input routine for the sysfs max_sectors file */
static ssize_t store_max_sectors(struct device *dev, const char *buf, static ssize_t store_max_sectors(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct scsi_device *sdev = to_scsi_device(dev); struct scsi_device *sdev = to_scsi_device(dev);
......
drivers/video/gbefb.c
View file @ 060b8845
...@@ -1045,14 +1045,14 @@ static struct fb_ops gbefb_ops = { ...@@ -1045,14 +1045,14 @@ static struct fb_ops gbefb_ops = {
* sysfs * sysfs
*/ */
static ssize_t gbefb_show_memsize(struct device *dev, char *buf) static ssize_t gbefb_show_memsize(struct device *dev, struct device_attribute *attr, char *buf)
{ {
return snprintf(buf, PAGE_SIZE, "%d\n", gbe_mem_size); return snprintf(buf, PAGE_SIZE, "%d\n", gbe_mem_size);
} }
static DEVICE_ATTR(size, S_IRUGO, gbefb_show_memsize, NULL); static DEVICE_ATTR(size, S_IRUGO, gbefb_show_memsize, NULL);
static ssize_t gbefb_show_rev(struct device *device, char *buf) static ssize_t gbefb_show_rev(struct device *device, struct device_attribute *attr, char *buf)
{ {
return snprintf(buf, PAGE_SIZE, "%d\n", gbe_revision); return snprintf(buf, PAGE_SIZE, "%d\n", gbe_revision);
} }
......
drivers/video/w100fb.c
View file @ 060b8845
...@@ -101,7 +101,7 @@ static void(*w100fb_ssp_send)(u8 adrs, u8 data); ...@@ -101,7 +101,7 @@ static void(*w100fb_ssp_send)(u8 adrs, u8 data);
* Sysfs functions * Sysfs functions
*/ */
static ssize_t rotation_show(struct device *dev, char *buf) static ssize_t rotation_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct fb_info *info = dev_get_drvdata(dev); struct fb_info *info = dev_get_drvdata(dev);
struct w100fb_par *par=info->par; struct w100fb_par *par=info->par;
...@@ -109,7 +109,7 @@ static ssize_t rotation_show(struct device *dev, char *buf) ...@@ -109,7 +109,7 @@ static ssize_t rotation_show(struct device *dev, char *buf)
return sprintf(buf, "%d\n",par->rotation_flag); return sprintf(buf, "%d\n",par->rotation_flag);
} }
static ssize_t rotation_store(struct device *dev, const char *buf, size_t count) static ssize_t rotation_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
unsigned int rotate; unsigned int rotate;
struct fb_info *info = dev_get_drvdata(dev); struct fb_info *info = dev_get_drvdata(dev);
...@@ -134,7 +134,7 @@ static ssize_t rotation_store(struct device *dev, const char *buf, size_t count) ...@@ -134,7 +134,7 @@ static ssize_t rotation_store(struct device *dev, const char *buf, size_t count)
static DEVICE_ATTR(rotation, 0644, rotation_show, rotation_store); static DEVICE_ATTR(rotation, 0644, rotation_show, rotation_store);
static ssize_t w100fb_reg_read(struct device *dev, const char *buf, size_t count) static ssize_t w100fb_reg_read(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
unsigned long param; unsigned long param;
unsigned long regs; unsigned long regs;
...@@ -146,7 +146,7 @@ static ssize_t w100fb_reg_read(struct device *dev, const char *buf, size_t count ...@@ -146,7 +146,7 @@ static ssize_t w100fb_reg_read(struct device *dev, const char *buf, size_t count
static DEVICE_ATTR(reg_read, 0200, NULL, w100fb_reg_read); static DEVICE_ATTR(reg_read, 0200, NULL, w100fb_reg_read);
static ssize_t w100fb_reg_write(struct device *dev, const char *buf, size_t count) static ssize_t w100fb_reg_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
unsigned long regs; unsigned long regs;
unsigned long param; unsigned long param;
...@@ -163,7 +163,7 @@ static ssize_t w100fb_reg_write(struct device *dev, const char *buf, size_t coun ...@@ -163,7 +163,7 @@ static ssize_t w100fb_reg_write(struct device *dev, const char *buf, size_t coun
static DEVICE_ATTR(reg_write, 0200, NULL, w100fb_reg_write); static DEVICE_ATTR(reg_write, 0200, NULL, w100fb_reg_write);
static ssize_t fastsysclk_show(struct device *dev, char *buf) static ssize_t fastsysclk_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct fb_info *info = dev_get_drvdata(dev); struct fb_info *info = dev_get_drvdata(dev);
struct w100fb_par *par=info->par; struct w100fb_par *par=info->par;
...@@ -171,7 +171,7 @@ static ssize_t fastsysclk_show(struct device *dev, char *buf) ...@@ -171,7 +171,7 @@ static ssize_t fastsysclk_show(struct device *dev, char *buf)
return sprintf(buf, "%d\n",par->fastsysclk_mode); return sprintf(buf, "%d\n",par->fastsysclk_mode);
} }
static ssize_t fastsysclk_store(struct device *dev, const char *buf, size_t count) static ssize_t fastsysclk_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
int param; int param;
struct fb_info *info = dev_get_drvdata(dev); struct fb_info *info = dev_get_drvdata(dev);
......
drivers/w1/w1.c
View file @ 060b8845
...@@ -88,7 +88,7 @@ static void w1_slave_release(struct device *dev) ...@@ -88,7 +88,7 @@ static void w1_slave_release(struct device *dev)
complete(&sl->dev_released); complete(&sl->dev_released);
} }
static ssize_t w1_default_read_name(struct device *dev, char *buf) static ssize_t w1_default_read_name(struct device *dev, struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "No family registered.\n"); return sprintf(buf, "No family registered.\n");
} }
...@@ -137,7 +137,7 @@ static struct device_attribute w1_slave_attribute_val = { ...@@ -137,7 +137,7 @@ static struct device_attribute w1_slave_attribute_val = {
.show = &w1_default_read_name, .show = &w1_default_read_name,
}; };
static ssize_t w1_master_attribute_show_name(struct device *dev, char *buf) static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w1_master *md = container_of (dev, struct w1_master, dev); struct w1_master *md = container_of (dev, struct w1_master, dev);
ssize_t count; ssize_t count;
...@@ -152,7 +152,7 @@ static ssize_t w1_master_attribute_show_name(struct device *dev, char *buf) ...@@ -152,7 +152,7 @@ static ssize_t w1_master_attribute_show_name(struct device *dev, char *buf)
return count; return count;
} }
static ssize_t w1_master_attribute_show_pointer(struct device *dev, char *buf) static ssize_t w1_master_attribute_show_pointer(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w1_master *md = container_of(dev, struct w1_master, dev); struct w1_master *md = container_of(dev, struct w1_master, dev);
ssize_t count; ssize_t count;
...@@ -166,14 +166,14 @@ static ssize_t w1_master_attribute_show_pointer(struct device *dev, char *buf) ...@@ -166,14 +166,14 @@ static ssize_t w1_master_attribute_show_pointer(struct device *dev, char *buf)
return count; return count;
} }
static ssize_t w1_master_attribute_show_timeout(struct device *dev, char *buf) static ssize_t w1_master_attribute_show_timeout(struct device *dev, struct device_attribute *attr, char *buf)
{ {
ssize_t count; ssize_t count;
count = sprintf(buf, "%d\n", w1_timeout); count = sprintf(buf, "%d\n", w1_timeout);
return count; return count;
} }
static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, char *buf) static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w1_master *md = container_of(dev, struct w1_master, dev); struct w1_master *md = container_of(dev, struct w1_master, dev);
ssize_t count; ssize_t count;
...@@ -187,7 +187,7 @@ static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, char ...@@ -187,7 +187,7 @@ static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, char
return count; return count;
} }
static ssize_t w1_master_attribute_show_attempts(struct device *dev, char *buf) static ssize_t w1_master_attribute_show_attempts(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w1_master *md = container_of(dev, struct w1_master, dev); struct w1_master *md = container_of(dev, struct w1_master, dev);
ssize_t count; ssize_t count;
...@@ -201,7 +201,7 @@ static ssize_t w1_master_attribute_show_attempts(struct device *dev, char *buf) ...@@ -201,7 +201,7 @@ static ssize_t w1_master_attribute_show_attempts(struct device *dev, char *buf)
return count; return count;
} }
static ssize_t w1_master_attribute_show_slave_count(struct device *dev, char *buf) static ssize_t w1_master_attribute_show_slave_count(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w1_master *md = container_of(dev, struct w1_master, dev); struct w1_master *md = container_of(dev, struct w1_master, dev);
ssize_t count; ssize_t count;
...@@ -215,7 +215,7 @@ static ssize_t w1_master_attribute_show_slave_count(struct device *dev, char *bu ...@@ -215,7 +215,7 @@ static ssize_t w1_master_attribute_show_slave_count(struct device *dev, char *bu
return count; return count;
} }
static ssize_t w1_master_attribute_show_slaves(struct device *dev, char *buf) static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w1_master *md = container_of(dev, struct w1_master, dev); struct w1_master *md = container_of(dev, struct w1_master, dev);
......
drivers/w1/w1_family.h
View file @ 060b8845
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
struct w1_family_ops struct w1_family_ops
{ {
ssize_t (* rname)(struct device *, char *); ssize_t (* rname)(struct device *, struct device_attribute *, char *);
ssize_t (* rbin)(struct kobject *, char *, loff_t, size_t); ssize_t (* rbin)(struct kobject *, char *, loff_t, size_t);
ssize_t (* rval)(struct device *, char *); ssize_t (* rval)(struct device *, struct device_attribute *, char *);
unsigned char rvalname[MAXNAMELEN]; unsigned char rvalname[MAXNAMELEN];
}; };
......
drivers/w1/w1_smem.c
View file @ 060b8845
...@@ -36,8 +36,8 @@ MODULE_LICENSE("GPL"); ...@@ -36,8 +36,8 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>"); MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, 64bit memory family."); MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, 64bit memory family.");
static ssize_t w1_smem_read_name(struct device *, char *); static ssize_t w1_smem_read_name(struct device *, struct device_attribute *attr, char *);
static ssize_t w1_smem_read_val(struct device *, char *); static ssize_t w1_smem_read_val(struct device *, struct device_attribute *attr, char *);
static ssize_t w1_smem_read_bin(struct kobject *, char *, loff_t, size_t); static ssize_t w1_smem_read_bin(struct kobject *, char *, loff_t, size_t);
static struct w1_family_ops w1_smem_fops = { static struct w1_family_ops w1_smem_fops = {
...@@ -47,14 +47,14 @@ static struct w1_family_ops w1_smem_fops = { ...@@ -47,14 +47,14 @@ static struct w1_family_ops w1_smem_fops = {
.rvalname = "id", .rvalname = "id",
}; };
static ssize_t w1_smem_read_name(struct device *dev, char *buf) static ssize_t w1_smem_read_name(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w1_slave *sl = container_of(dev, struct w1_slave, dev); struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
return sprintf(buf, "%s\n", sl->name); return sprintf(buf, "%s\n", sl->name);
} }
static ssize_t w1_smem_read_val(struct device *dev, char *buf) static ssize_t w1_smem_read_val(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w1_slave *sl = container_of(dev, struct w1_slave, dev); struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
int i; int i;
......
drivers/w1/w1_therm.c
View file @ 060b8845
...@@ -42,8 +42,8 @@ static u8 bad_roms[][9] = { ...@@ -42,8 +42,8 @@ static u8 bad_roms[][9] = {
{} {}
}; };
static ssize_t w1_therm_read_name(struct device *, char *); static ssize_t w1_therm_read_name(struct device *, struct device_attribute *attr, char *);
static ssize_t w1_therm_read_temp(struct device *, char *); static ssize_t w1_therm_read_temp(struct device *, struct device_attribute *attr, char *);
static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t); static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t);
static struct w1_family_ops w1_therm_fops = { static struct w1_family_ops w1_therm_fops = {
...@@ -53,7 +53,7 @@ static struct w1_family_ops w1_therm_fops = { ...@@ -53,7 +53,7 @@ static struct w1_family_ops w1_therm_fops = {
.rvalname = "temp1_input", .rvalname = "temp1_input",
}; };
static ssize_t w1_therm_read_name(struct device *dev, char *buf) static ssize_t w1_therm_read_name(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w1_slave *sl = container_of(dev, struct w1_slave, dev); struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
...@@ -77,7 +77,7 @@ static inline int w1_convert_temp(u8 rom[9]) ...@@ -77,7 +77,7 @@ static inline int w1_convert_temp(u8 rom[9])
return t; return t;
} }
static ssize_t w1_therm_read_temp(struct device *dev, char *buf) static ssize_t w1_therm_read_temp(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w1_slave *sl = container_of(dev, struct w1_slave, dev); struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
......
drivers/zorro/zorro-sysfs.c
View file @ 060b8845
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/* show configuration fields */ /* show configuration fields */
#define zorro_config_attr(name, field, format_string) \ #define zorro_config_attr(name, field, format_string) \
static ssize_t \ static ssize_t \
show_##name(struct device *dev, char *buf) \ show_##name(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct zorro_dev *z; \ struct zorro_dev *z; \
\ \
...@@ -36,7 +36,7 @@ zorro_config_attr(serial, rom.er_SerialNumber, "0x%08x\n"); ...@@ -36,7 +36,7 @@ zorro_config_attr(serial, rom.er_SerialNumber, "0x%08x\n");
zorro_config_attr(slotaddr, slotaddr, "0x%04x\n"); zorro_config_attr(slotaddr, slotaddr, "0x%04x\n");
zorro_config_attr(slotsize, slotsize, "0x%04x\n"); zorro_config_attr(slotsize, slotsize, "0x%04x\n");
static ssize_t zorro_show_resource(struct device *dev, char *buf) static ssize_t zorro_show_resource(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct zorro_dev *z = to_zorro_dev(dev); struct zorro_dev *z = to_zorro_dev(dev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7