[PATCH] Driver Core: drivers/usb/input/aiptek.c - drivers/zorro/zorro-sysfs.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:
committed by
Greg Kroah-Hartman
parent
10523b3b82
commit
060b8845e6
@@ -1025,7 +1025,7 @@ static int aiptek_program_tablet(struct aiptek *aiptek)
|
||||
/***********************************************************************
|
||||
* 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);
|
||||
|
||||
@@ -1048,7 +1048,7 @@ static DEVICE_ATTR(size, S_IRUGO, show_tabletSize, NULL);
|
||||
/***********************************************************************
|
||||
* 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);
|
||||
|
||||
@@ -1064,7 +1064,7 @@ static DEVICE_ATTR(product_id, S_IRUGO, show_tabletProductId, NULL);
|
||||
/***********************************************************************
|
||||
* 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);
|
||||
|
||||
@@ -1079,7 +1079,7 @@ static DEVICE_ATTR(vendor_id, S_IRUGO, show_tabletVendorId, NULL);
|
||||
/***********************************************************************
|
||||
* 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);
|
||||
int retval;
|
||||
@@ -1096,7 +1096,7 @@ static DEVICE_ATTR(vendor, S_IRUGO, show_tabletManufacturer, NULL);
|
||||
/***********************************************************************
|
||||
* 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);
|
||||
int retval;
|
||||
@@ -1114,7 +1114,7 @@ static DEVICE_ATTR(product, S_IRUGO, show_tabletProduct, NULL);
|
||||
* support routines for the 'pointer_mode' file. Note that this file
|
||||
* 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);
|
||||
char *s;
|
||||
@@ -1143,7 +1143,7 @@ static ssize_t show_tabletPointerMode(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
if (aiptek == NULL)
|
||||
@@ -1168,7 +1168,7 @@ static DEVICE_ATTR(pointer_mode,
|
||||
* support routines for the 'coordinate_mode' file. Note that this file
|
||||
* 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);
|
||||
char *s;
|
||||
@@ -1193,7 +1193,7 @@ static ssize_t show_tabletCoordinateMode(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
if (aiptek == NULL)
|
||||
@@ -1217,7 +1217,7 @@ static DEVICE_ATTR(coordinate_mode,
|
||||
* support routines for the 'tool_mode' file. Note that this file
|
||||
* 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);
|
||||
char *s;
|
||||
@@ -1262,7 +1262,7 @@ static ssize_t show_tabletToolMode(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
if (aiptek == NULL)
|
||||
@@ -1295,7 +1295,7 @@ static DEVICE_ATTR(tool_mode,
|
||||
* support routines for the 'xtilt' file. Note that this file
|
||||
* 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);
|
||||
|
||||
@@ -1311,7 +1311,7 @@ static ssize_t show_tabletXtilt(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
int x;
|
||||
@@ -1337,7 +1337,7 @@ static DEVICE_ATTR(xtilt,
|
||||
* support routines for the 'ytilt' file. Note that this file
|
||||
* 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);
|
||||
|
||||
@@ -1353,7 +1353,7 @@ static ssize_t show_tabletYtilt(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
int y;
|
||||
@@ -1379,7 +1379,7 @@ static DEVICE_ATTR(ytilt,
|
||||
* support routines for the 'jitter' file. Note that this file
|
||||
* 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);
|
||||
|
||||
@@ -1390,7 +1390,7 @@ static ssize_t show_tabletJitterDelay(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -1409,7 +1409,7 @@ static DEVICE_ATTR(jitter,
|
||||
* support routines for the 'delay' file. Note that this file
|
||||
* 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);
|
||||
|
||||
@@ -1421,7 +1421,7 @@ static ssize_t show_tabletProgrammableDelay(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -1440,7 +1440,7 @@ static DEVICE_ATTR(delay,
|
||||
* support routines for the 'input_path' file. Note that this file
|
||||
* 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);
|
||||
|
||||
@@ -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
|
||||
* 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);
|
||||
|
||||
@@ -1473,7 +1473,7 @@ static DEVICE_ATTR(event_count, S_IRUGO, show_tabletEventsReceived, NULL);
|
||||
* support routines for the 'diagnostic' file. Note that this file
|
||||
* 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);
|
||||
char *retMsg;
|
||||
@@ -1515,7 +1515,7 @@ static DEVICE_ATTR(diagnostic, S_IRUGO, show_tabletDiagnosticMessage, NULL);
|
||||
* support routines for the 'stylus_upper' file. Note that this file
|
||||
* 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);
|
||||
char *s;
|
||||
@@ -1540,7 +1540,7 @@ static ssize_t show_tabletStylusUpper(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -1565,7 +1565,7 @@ static DEVICE_ATTR(stylus_upper,
|
||||
* support routines for the 'stylus_lower' file. Note that this file
|
||||
* 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);
|
||||
char *s;
|
||||
@@ -1590,7 +1590,7 @@ static ssize_t show_tabletStylusLower(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -1615,7 +1615,7 @@ static DEVICE_ATTR(stylus_lower,
|
||||
* support routines for the 'mouse_left' file. Note that this file
|
||||
* 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);
|
||||
char *s;
|
||||
@@ -1644,7 +1644,7 @@ static ssize_t show_tabletMouseLeft(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -1669,7 +1669,7 @@ static DEVICE_ATTR(mouse_left,
|
||||
* support routines for the 'mouse_middle' file. Note that this file
|
||||
* 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);
|
||||
char *s;
|
||||
@@ -1698,7 +1698,7 @@ static ssize_t show_tabletMouseMiddle(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -1725,7 +1725,7 @@ static DEVICE_ATTR(mouse_middle,
|
||||
* support routines for the 'mouse_right' file. Note that this file
|
||||
* 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);
|
||||
char *s;
|
||||
@@ -1754,7 +1754,7 @@ static ssize_t show_tabletMouseRight(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -1780,7 +1780,7 @@ static DEVICE_ATTR(mouse_right,
|
||||
* support routines for the 'wheel' file. Note that this file
|
||||
* 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);
|
||||
|
||||
@@ -1796,7 +1796,7 @@ static ssize_t show_tabletWheel(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -1814,7 +1814,7 @@ static DEVICE_ATTR(wheel,
|
||||
* support routines for the 'execute' file. Note that this file
|
||||
* 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);
|
||||
|
||||
@@ -1829,7 +1829,7 @@ static ssize_t show_tabletExecute(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -1855,7 +1855,7 @@ static DEVICE_ATTR(execute,
|
||||
* support routines for the 'odm_code' file. Note that this file
|
||||
* 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);
|
||||
|
||||
@@ -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
|
||||
* 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);
|
||||
|
||||
@@ -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
|
||||
* 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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user