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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
st5481_init.c
diff --git
a/drivers/isdn/hisax/st5481_init.c
b/drivers/isdn/hisax/st5481_init.c
index
92676bd
..
bb3a28a
100644
(file)
--- a/
drivers/isdn/hisax/st5481_init.c
+++ b/
drivers/isdn/hisax/st5481_init.c
@@
-24,8
+24,6
@@
* clean up debug
*/
* clean up debug
*/
-#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb.h>
@@
-37,16
+35,16
@@
MODULE_AUTHOR("Frode Isaksen");
MODULE_LICENSE("GPL");
static int protocol = 2; /* EURO-ISDN Default */
MODULE_LICENSE("GPL");
static int protocol = 2; /* EURO-ISDN Default */
-
MODULE_PARM(protocol, "i"
);
+
module_param(protocol, int, 0
);
static int number_of_leds = 2; /* 2 LEDs on the adpater default */
static int number_of_leds = 2; /* 2 LEDs on the adpater default */
-
MODULE_PARM(number_of_leds, "i"
);
+
module_param(number_of_leds, int, 0
);
#ifdef CONFIG_HISAX_DEBUG
#ifdef CONFIG_HISAX_DEBUG
-static int debug = 0x1;
-MODULE_PARM(debug, "i");
-int st5481_debug;
+static int debug = 0;
+module_param(debug, int, 0);
#endif
#endif
+int st5481_debug;
static LIST_HEAD(adapter_list);
static LIST_HEAD(adapter_list);
@@
-67,15
+65,14
@@
static int probe_st5481(struct usb_interface *intf,
int retval, i;
printk(KERN_INFO "st541: found adapter VendorId %04x, ProductId %04x, LEDs %d\n",
int retval, i;
printk(KERN_INFO "st541: found adapter VendorId %04x, ProductId %04x, LEDs %d\n",
- dev->descriptor.idVendor, dev->descriptor.idProduct,
+ le16_to_cpu(dev->descriptor.idVendor),
+ le16_to_cpu(dev->descriptor.idProduct),
number_of_leds);
number_of_leds);
- adapter = k
m
alloc(sizeof(struct st5481_adapter), GFP_KERNEL);
+ adapter = k
z
alloc(sizeof(struct st5481_adapter), GFP_KERNEL);
if (!adapter)
return -ENOMEM;
if (!adapter)
return -ENOMEM;
- memset(adapter, 0, sizeof(struct st5481_adapter));
-
adapter->number_of_leds = number_of_leds;
adapter->usb_dev = dev;
adapter->number_of_leds = number_of_leds;
adapter->usb_dev = dev;
@@
-180,7
+177,6
@@
static struct usb_device_id st5481_ids[] = {
MODULE_DEVICE_TABLE (usb, st5481_ids);
static struct usb_driver st5481_usb_driver = {
MODULE_DEVICE_TABLE (usb, st5481_ids);
static struct usb_driver st5481_usb_driver = {
- .owner = THIS_MODULE,
.name = "st5481_usb",
.probe = probe_st5481,
.disconnect = disconnect_st5481,
.name = "st5481_usb",
.probe = probe_st5481,
.disconnect = disconnect_st5481,