git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
usb
/
misc
/
phidgetservo.c
diff --git
a/drivers/usb/misc/phidgetservo.c
b/drivers/usb/misc/phidgetservo.c
index
4bd2915
..
5a040c2
100644
(file)
--- a/
drivers/usb/misc/phidgetservo.c
+++ b/
drivers/usb/misc/phidgetservo.c
@@
-26,9
+26,6
@@
*/
#include <linux/config.h>
*/
#include <linux/config.h>
-#ifdef CONFIG_USB_DEBUG
-#define DEBUG 1
-#endif
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
@@
-207,7
+204,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) \
{ \
int degrees, minutes, retval; \
const char *buf, size_t count) \
{ \
int degrees, minutes, retval; \
@@
-233,7
+230,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 phidget_servo *servo = usb_get_intfdata (intf); \
{ \
struct usb_interface *intf = to_usb_interface (dev); \
struct phidget_servo *servo = usb_get_intfdata (intf); \
@@
-255,12
+252,11
@@
servo_probe(struct usb_interface *interface, const struct usb_device_id *id)
struct usb_device *udev = interface_to_usbdev(interface);
struct phidget_servo *dev;
struct usb_device *udev = interface_to_usbdev(interface);
struct phidget_servo *dev;
- dev = k
m
alloc(sizeof (struct phidget_servo), GFP_KERNEL);
+ dev = k
z
alloc(sizeof (struct phidget_servo), GFP_KERNEL);
if (dev == NULL) {
dev_err(&interface->dev, "%s - out of memory\n", __FUNCTION__);
return -ENOMEM;
}
if (dev == NULL) {
dev_err(&interface->dev, "%s - out of memory\n", __FUNCTION__);
return -ENOMEM;
}
- memset(dev, 0x00, sizeof (*dev));
dev->udev = usb_get_dev(udev);
dev->type = id->driver_info;
dev->udev = usb_get_dev(udev);
dev->type = id->driver_info;
@@
-309,7
+305,6
@@
servo_disconnect(struct usb_interface *interface)
}
static struct usb_driver servo_driver = {
}
static struct usb_driver servo_driver = {
- .owner = THIS_MODULE,
.name = "phidgetservo",
.probe = servo_probe,
.disconnect = servo_disconnect,
.name = "phidgetservo",
.probe = servo_probe,
.disconnect = servo_disconnect,