[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:
Yani Ioannou
committed by
Greg Kroah-Hartman
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);
|
||||
|
||||
|
||||
@@ -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_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_cytherm *cytherm = usb_get_intfdata(intf);
|
||||
@@ -93,7 +93,7 @@ static ssize_t show_brightness(struct device *dev, char *buf)
|
||||
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)
|
||||
{
|
||||
struct usb_interface *intf = to_usb_interface(dev);
|
||||
@@ -138,7 +138,7 @@ static DEVICE_ATTR(brightness, S_IRUGO | S_IWUSR | S_IWGRP,
|
||||
#define TEMP 0x33 /* RAM location for temperature */
|
||||
#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);
|
||||
@@ -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;
|
||||
}
|
||||
@@ -184,7 +184,7 @@ static DEVICE_ATTR(temp, S_IRUGO, show_temp, set_temp);
|
||||
|
||||
#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);
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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 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_cytherm *cytherm = usb_get_intfdata(intf);
|
||||
@@ -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_cytherm *cytherm = usb_get_intfdata(intf);
|
||||
@@ -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 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_cytherm *cytherm = usb_get_intfdata(intf);
|
||||
@@ -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_cytherm *cytherm = usb_get_intfdata(intf);
|
||||
|
||||
@@ -173,7 +173,7 @@ exit:
|
||||
}
|
||||
|
||||
#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 phidget_interfacekit *kit = usb_get_intfdata(intf); \
|
||||
@@ -184,7 +184,7 @@ static DEVICE_ATTR(lcd_line_##number, S_IWUGO, NULL, lcd_line_##number);
|
||||
set_lcd_line(1);
|
||||
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 phidget_interfacekit *kit = usb_get_intfdata(intf);
|
||||
@@ -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 phidget_interfacekit *kit = usb_get_intfdata(intf);
|
||||
@@ -307,7 +307,7 @@ resubmit:
|
||||
}
|
||||
|
||||
#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) \
|
||||
{ \
|
||||
struct usb_interface *intf = to_usb_interface(dev); \
|
||||
@@ -324,7 +324,7 @@ static ssize_t set_output##value(struct device *dev, const char *buf, \
|
||||
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 phidget_interfacekit *kit = usb_get_intfdata(intf); \
|
||||
@@ -343,7 +343,7 @@ show_set_output(7);
|
||||
show_set_output(8); /* should be MAX_INTERFACES - 1 */
|
||||
|
||||
#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 phidget_interfacekit *kit = usb_get_intfdata(intf); \
|
||||
@@ -362,7 +362,7 @@ show_input(7);
|
||||
show_input(8); /* should be MAX_INTERFACES - 1 */
|
||||
|
||||
#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 phidget_interfacekit *kit = usb_get_intfdata(intf); \
|
||||
|
||||
@@ -207,7 +207,7 @@ change_position_v20(struct phidget_servo *servo, int servo_no, int degrees,
|
||||
}
|
||||
|
||||
#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) \
|
||||
{ \
|
||||
int degrees, minutes, retval; \
|
||||
@@ -233,7 +233,7 @@ static ssize_t set_servo##value (struct device *dev, \
|
||||
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 phidget_servo *servo = usb_get_intfdata (intf); \
|
||||
|
||||
@@ -81,14 +81,14 @@ static void change_color(struct usb_led *led)
|
||||
}
|
||||
|
||||
#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_led *led = usb_get_intfdata(intf); \
|
||||
\
|
||||
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_led *led = usb_get_intfdata(intf); \
|
||||
|
||||
@@ -1218,7 +1218,7 @@ check_and_exit:
|
||||
* ***************************************************************************
|
||||
*/
|
||||
|
||||
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 ftdi_private *priv = usb_get_serial_port_data(port);
|
||||
@@ -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. */
|
||||
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)
|
||||
{
|
||||
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,
|
||||
|
||||
/* 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. */
|
||||
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)
|
||||
{
|
||||
struct usb_serial_port *port = to_usb_serial_port(dev);
|
||||
|
||||
@@ -398,7 +398,7 @@ US_DO_ALL_FLAGS
|
||||
***********************************************************************/
|
||||
|
||||
/* 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);
|
||||
|
||||
@@ -406,7 +406,7 @@ static ssize_t show_max_sectors(struct device *dev, char *buf)
|
||||
}
|
||||
|
||||
/* 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)
|
||||
{
|
||||
struct scsi_device *sdev = to_scsi_device(dev);
|
||||
|
||||
Reference in New Issue
Block a user