Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 177532
Collapse All | Expand All

(-)/var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.c (-4 / +4 lines)
Lines 106-112 Link Here
106
static int			hard_error_issued	= FALSE;
106
static int			hard_error_issued	= FALSE;
107
static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
107
static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
108
static struct work_struct	closing_work;
108
static struct work_struct	closing_work;
109
static void			closing_worker (void *);
109
static void			closing_worker (struct work_struct *);
110
static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
110
static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
111
static void		     (* close_func) (void *)	= NULL;
111
static void		     (* close_func) (void *)	= NULL;
112
static void *			close_data		= NULL;
112
static void *			close_data		= NULL;
Lines 341-348 Link Here
341
341
342
/*---------------------------------------------------------------------------*\
342
/*---------------------------------------------------------------------------*\
343
\*---------------------------------------------------------------------------*/
343
\*---------------------------------------------------------------------------*/
344
static void closing_worker (void * ctx) {
344
static void closing_worker (struct work_struct *work) {
345
	card_p	card = (card_p) ctx;
345
	card_p	card = capi_card;
346
346
347
	DECLARE_WAIT_QUEUE_HEAD(close_wait);
347
	DECLARE_WAIT_QUEUE_HEAD(close_wait);
348
348
Lines 434-440 Link Here
434
	close_func = func;
434
	close_func = func;
435
	close_data = data;
435
	close_data = data;
436
436
437
	INIT_WORK (&closing_work, closing_worker, capi_card);
437
	INIT_WORK (&closing_work, closing_worker);
438
	schedule_work (&closing_work);
438
	schedule_work (&closing_work);
439
	LOG("Worker scheduled.\n");
439
	LOG("Worker scheduled.\n");
440
} /* start_closing_worker */
440
} /* start_closing_worker */
(-)/var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.c (-4 / +4 lines)
Lines 84-90 Link Here
84
static atomic_t			thread_capi_flag;
84
static atomic_t			thread_capi_flag;
85
static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
85
static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
86
static struct work_struct	closing_work;
86
static struct work_struct	closing_work;
87
static void			closing_worker (void *);
87
static void			closing_worker (struct work_struct *);
88
static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
88
static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
89
static void		     (* close_func) (void *)	= NULL;
89
static void		     (* close_func) (void *)	= NULL;
90
static void *			close_data		= NULL;
90
static void *			close_data		= NULL;
Lines 699-706 Link Here
699
699
700
/*-C-------------------------------------------------------------------------*\
700
/*-C-------------------------------------------------------------------------*\
701
\*---------------------------------------------------------------------------*/
701
\*---------------------------------------------------------------------------*/
702
static void closing_worker (void * ctx) {
702
static void closing_worker (struct work_struct *work) {
703
	card_p	card = (card_p) ctx;
703
	card_p	card = capi_card;
704
704
705
	DECLARE_WAIT_QUEUE_HEAD(close_wait);
705
	DECLARE_WAIT_QUEUE_HEAD(close_wait);
706
706
Lines 787-793 Link Here
787
	close_func = func;
787
	close_func = func;
788
	close_data = data;
788
	close_data = data;
789
789
790
	INIT_WORK (&closing_work, closing_worker, capi_card);
790
	INIT_WORK (&closing_work, closing_worker);
791
	schedule_work (&closing_work);
791
	schedule_work (&closing_work);
792
	LOG("Worker scheduled.\n");
792
	LOG("Worker scheduled.\n");
793
} /* start_closing_worker */
793
} /* start_closing_worker */
(-)/var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb/main.c (-8 / +1 lines)
Lines 76-89 Link Here
76
} ;
76
} ;
77
77
78
static struct usb_driver usb_driver = {
78
static struct usb_driver usb_driver = {
79
#ifndef OLD_USB_DRIVER
79
	.name =		TARGET,
80
	.driver = {
81
#endif
82
		.owner =	THIS_MODULE,
83
		.name =		TARGET,
84
#ifndef OLD_USB_DRIVER
85
	},
86
#endif
87
	.id_table =	usb_id_table,
80
	.id_table =	usb_id_table,
88
	.probe =	usb_probe,
81
	.probe =	usb_probe,
89
	.disconnect =	usb_disconnect,
82
	.disconnect =	usb_disconnect,
(-)/var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.c (-4 / +4 lines)
Lines 106-112 Link Here
106
static int			hard_error_issued	= FALSE;
106
static int			hard_error_issued	= FALSE;
107
static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
107
static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
108
static struct work_struct	closing_work;
108
static struct work_struct	closing_work;
109
static void			closing_worker (void *);
109
static void			closing_worker (struct work_struct *);
110
static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
110
static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
111
static void		     (* close_func) (void *)	= NULL;
111
static void		     (* close_func) (void *)	= NULL;
112
static void *			close_data		= NULL;
112
static void *			close_data		= NULL;
Lines 341-348 Link Here
341
341
342
/*---------------------------------------------------------------------------*\
342
/*---------------------------------------------------------------------------*\
343
\*---------------------------------------------------------------------------*/
343
\*---------------------------------------------------------------------------*/
344
static void closing_worker (void * ctx) {
344
static void closing_worker (struct work_struct *work) {
345
	card_p	card = (card_p) ctx;
345
	card_p	card = capi_card;
346
346
347
	DECLARE_WAIT_QUEUE_HEAD(close_wait);
347
	DECLARE_WAIT_QUEUE_HEAD(close_wait);
348
348
Lines 434-440 Link Here
434
	close_func = func;
434
	close_func = func;
435
	close_data = data;
435
	close_data = data;
436
436
437
	INIT_WORK (&closing_work, closing_worker, capi_card);
437
	INIT_WORK (&closing_work, closing_worker);
438
	schedule_work (&closing_work);
438
	schedule_work (&closing_work);
439
	LOG("Worker scheduled.\n");
439
	LOG("Worker scheduled.\n");
440
} /* start_closing_worker */
440
} /* start_closing_worker */
(-)/var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c (-9 / +1 lines)
Lines 91-105 Link Here
91
} ;
91
} ;
92
92
93
static struct usb_driver usb_driver = {
93
static struct usb_driver usb_driver = {
94
94
	.name =		TARGET,
95
#ifndef OLD_USB_DRIVER
96
	.driver = {
97
#endif
98
		.owner =	THIS_MODULE,
99
		.name =		TARGET,
100
#ifndef OLD_USB_DRIVER
101
	},
102
#endif
103
	.id_table =	usb_id_table,
95
	.id_table =	usb_id_table,
104
	.probe =	usb_probe,
96
	.probe =	usb_probe,
105
	.disconnect =	usb_disconnect,
97
	.disconnect =	usb_disconnect,
(-)/var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.c (-4 / +4 lines)
Lines 106-112 Link Here
106
static int			hard_error_issued	= FALSE;
106
static int			hard_error_issued	= FALSE;
107
static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
107
static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
108
static struct work_struct	closing_work;
108
static struct work_struct	closing_work;
109
static void			closing_worker (void *);
109
static void			closing_worker (struct work_struct *);
110
static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
110
static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
111
static void		     (* close_func) (void *)	= NULL;
111
static void		     (* close_func) (void *)	= NULL;
112
static void *			close_data		= NULL;
112
static void *			close_data		= NULL;
Lines 341-348 Link Here
341
341
342
/*---------------------------------------------------------------------------*\
342
/*---------------------------------------------------------------------------*\
343
\*---------------------------------------------------------------------------*/
343
\*---------------------------------------------------------------------------*/
344
static void closing_worker (void * ctx) {
344
static void closing_worker (struct work_struct *work) {
345
	card_p	card = (card_p) ctx;
345
	card_p	card = capi_card;
346
346
347
	DECLARE_WAIT_QUEUE_HEAD(close_wait);
347
	DECLARE_WAIT_QUEUE_HEAD(close_wait);
348
348
Lines 434-440 Link Here
434
	close_func = func;
434
	close_func = func;
435
	close_data = data;
435
	close_data = data;
436
436
437
	INIT_WORK (&closing_work, closing_worker, capi_card);
437
	INIT_WORK (&closing_work, closing_worker);
438
	schedule_work (&closing_work);
438
	schedule_work (&closing_work);
439
	LOG("Worker scheduled.\n");
439
	LOG("Worker scheduled.\n");
440
} /* start_closing_worker */
440
} /* start_closing_worker */
(-)/var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c (-9 / +1 lines)
Lines 91-105 Link Here
91
} ;
91
} ;
92
92
93
static struct usb_driver usb_driver = {
93
static struct usb_driver usb_driver = {
94
94
	.name =		TARGET,
95
#ifndef OLD_USB_DRIVER
96
	.driver = {
97
#endif
98
		.owner =	THIS_MODULE,
99
		.name =		TARGET,
100
#ifndef OLD_USB_DRIVER
101
	},
102
#endif
103
	.id_table =	usb_id_table,
95
	.id_table =	usb_id_table,
104
	.probe =	usb_probe,
96
	.probe =	usb_probe,
105
	.disconnect =	usb_disconnect,
97
	.disconnect =	usb_disconnect,

Return to bug 177532