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
/
hfc_usb.c
diff --git
a/drivers/isdn/hisax/hfc_usb.c
b/drivers/isdn/hisax/hfc_usb.c
index
262c441
..
5a6989f
100644
(file)
--- a/
drivers/isdn/hisax/hfc_usb.c
+++ b/
drivers/isdn/hisax/hfc_usb.c
@@
-32,7
+32,6
@@
#include <linux/types.h>
#include <linux/stddef.h>
#include <linux/timer.h>
#include <linux/types.h>
#include <linux/stddef.h>
#include <linux/timer.h>
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel_stat.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel_stat.h>
@@
-277,7
+276,7
@@
control_action_handler(hfcusb_data * hfc, int reg, int val, int action)
/* control completion routine handling background control cmds */
/***************************************************************/
static void
/* control completion routine handling background control cmds */
/***************************************************************/
static void
-ctrl_complete(struct urb *urb
, struct pt_regs *regs
)
+ctrl_complete(struct urb *urb)
{
hfcusb_data *hfc = (hfcusb_data *) urb->context;
ctrl_buft *buf;
{
hfcusb_data *hfc = (hfcusb_data *) urb->context;
ctrl_buft *buf;
@@
-604,7
+603,7
@@
static int iso_packets[8] =
/* transmit completion routine for all ISO tx fifos */
/*****************************************************/
static void
/* transmit completion routine for all ISO tx fifos */
/*****************************************************/
static void
-tx_iso_complete(struct urb *urb
, struct pt_regs *regs
)
+tx_iso_complete(struct urb *urb)
{
iso_urb_struct *context_iso_urb = (iso_urb_struct *) urb->context;
usb_fifo *fifo = context_iso_urb->owner_fifo;
{
iso_urb_struct *context_iso_urb = (iso_urb_struct *) urb->context;
usb_fifo *fifo = context_iso_urb->owner_fifo;
@@
-697,7
+696,7
@@
tx_iso_complete(struct urb *urb, struct pt_regs *regs)
fifo->delete_flg = TRUE;
fifo->hif->l1l2(fifo->hif,
PH_DATA | CONFIRM,
fifo->delete_flg = TRUE;
fifo->hif->l1l2(fifo->hif,
PH_DATA | CONFIRM,
- (void *) fifo->skbuff->
+ (void *)
(unsigned long)
fifo->skbuff->
truesize);
if (fifo->skbuff && fifo->delete_flg) {
dev_kfree_skb_any(fifo->skbuff);
truesize);
if (fifo->skbuff && fifo->delete_flg) {
dev_kfree_skb_any(fifo->skbuff);
@@
-727,7
+726,7
@@
tx_iso_complete(struct urb *urb, struct pt_regs *regs)
/* receive completion routine for all ISO tx fifos */
/*****************************************************/
static void
/* receive completion routine for all ISO tx fifos */
/*****************************************************/
static void
-rx_iso_complete(struct urb *urb
, struct pt_regs *regs
)
+rx_iso_complete(struct urb *urb)
{
iso_urb_struct *context_iso_urb = (iso_urb_struct *) urb->context;
usb_fifo *fifo = context_iso_urb->owner_fifo;
{
iso_urb_struct *context_iso_urb = (iso_urb_struct *) urb->context;
usb_fifo *fifo = context_iso_urb->owner_fifo;
@@
-920,7
+919,7
@@
collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
/* receive completion routine for all rx fifos */
/***********************************************/
static void
/* receive completion routine for all rx fifos */
/***********************************************/
static void
-rx_complete(struct urb *urb
, struct pt_regs *regs
)
+rx_complete(struct urb *urb)
{
int len;
int status;
{
int len;
int status;
@@
-1145,7
+1144,7
@@
hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
set_hfcmode(hfc,
(fifo->fifonum ==
HFCUSB_B1_TX) ? 0 : 1,
set_hfcmode(hfc,
(fifo->fifonum ==
HFCUSB_B1_TX) ? 0 : 1,
- (
int
) arg);
+ (
long
) arg);
fifo->hif->l1l2(fifo->hif,
PH_ACTIVATE | INDICATION,
NULL);
fifo->hif->l1l2(fifo->hif,
PH_ACTIVATE | INDICATION,
NULL);
@@
-1482,9
+1481,8
@@
hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
iface = iface_used;
if (!
(context =
iface = iface_used;
if (!
(context =
- k
m
alloc(sizeof(hfcusb_data), GFP_KERNEL)))
+ k
z
alloc(sizeof(hfcusb_data), GFP_KERNEL)))
return (-ENOMEM); /* got no mem */
return (-ENOMEM); /* got no mem */
- memset(context, 0, sizeof(hfcusb_data));
ep = iface->endpoint;
vcf = validconf[small_match];
ep = iface->endpoint;
vcf = validconf[small_match];