aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/cinergyT2/cinergyT2.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-11-22 09:57:56 -0500
committerDavid Howells <dhowells@redhat.com>2006-11-22 09:57:56 -0500
commitc4028958b6ecad064b1a6303a6a5906d4fe48d73 (patch)
tree1c4c89652c62a75da09f9b9442012007e4ac6250 /drivers/media/dvb/cinergyT2/cinergyT2.c
parent65f27f38446e1976cc98fd3004b110fedcddd189 (diff)
WorkStruct: make allyesconfig
Fix up for make allyesconfig. Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/media/dvb/cinergyT2/cinergyT2.c')
-rw-r--r--drivers/media/dvb/cinergyT2/cinergyT2.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index ff7d4f56ced3..dd0bcbe140bd 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -127,7 +127,7 @@ struct cinergyt2 {
127 127
128 struct dvbt_set_parameters_msg param; 128 struct dvbt_set_parameters_msg param;
129 struct dvbt_get_status_msg status; 129 struct dvbt_get_status_msg status;
130 struct work_struct query_work; 130 struct delayed_work query_work;
131 131
132 wait_queue_head_t poll_wq; 132 wait_queue_head_t poll_wq;
133 int pending_fe_events; 133 int pending_fe_events;
@@ -141,7 +141,7 @@ struct cinergyt2 {
141#ifdef ENABLE_RC 141#ifdef ENABLE_RC
142 struct input_dev *rc_input_dev; 142 struct input_dev *rc_input_dev;
143 char phys[64]; 143 char phys[64];
144 struct work_struct rc_query_work; 144 struct delayed_work rc_query_work;
145 int rc_input_event; 145 int rc_input_event;
146 u32 rc_last_code; 146 u32 rc_last_code;
147 unsigned long last_event_jiffies; 147 unsigned long last_event_jiffies;
@@ -724,9 +724,10 @@ static struct dvb_device cinergyt2_fe_template = {
724 724
725#ifdef ENABLE_RC 725#ifdef ENABLE_RC
726 726
727static void cinergyt2_query_rc (void *data) 727static void cinergyt2_query_rc (struct work_struct *work)
728{ 728{
729 struct cinergyt2 *cinergyt2 = data; 729 struct cinergyt2 *cinergyt2 =
730 container_of(work, struct cinergyt2, rc_query_work.work);
730 char buf[1] = { CINERGYT2_EP1_GET_RC_EVENTS }; 731 char buf[1] = { CINERGYT2_EP1_GET_RC_EVENTS };
731 struct cinergyt2_rc_event rc_events[12]; 732 struct cinergyt2_rc_event rc_events[12];
732 int n, len, i; 733 int n, len, i;
@@ -807,7 +808,7 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
807 strlcat(cinergyt2->phys, "/input0", sizeof(cinergyt2->phys)); 808 strlcat(cinergyt2->phys, "/input0", sizeof(cinergyt2->phys));
808 cinergyt2->rc_input_event = KEY_MAX; 809 cinergyt2->rc_input_event = KEY_MAX;
809 cinergyt2->rc_last_code = ~0; 810 cinergyt2->rc_last_code = ~0;
810 INIT_WORK(&cinergyt2->rc_query_work, cinergyt2_query_rc, cinergyt2); 811 INIT_DELAYED_WORK(&cinergyt2->rc_query_work, cinergyt2_query_rc);
811 812
812 input_dev->name = DRIVER_NAME " remote control"; 813 input_dev->name = DRIVER_NAME " remote control";
813 input_dev->phys = cinergyt2->phys; 814 input_dev->phys = cinergyt2->phys;
@@ -848,9 +849,10 @@ static inline void cinergyt2_resume_rc(struct cinergyt2 *cinergyt2) { }
848 849
849#endif /* ENABLE_RC */ 850#endif /* ENABLE_RC */
850 851
851static void cinergyt2_query (void *data) 852static void cinergyt2_query (struct work_struct *work)
852{ 853{
853 struct cinergyt2 *cinergyt2 = (struct cinergyt2 *) data; 854 struct cinergyt2 *cinergyt2 =
855 container_of(work, struct cinergyt2, query_work.work);
854 char cmd [] = { CINERGYT2_EP1_GET_TUNER_STATUS }; 856 char cmd [] = { CINERGYT2_EP1_GET_TUNER_STATUS };
855 struct dvbt_get_status_msg *s = &cinergyt2->status; 857 struct dvbt_get_status_msg *s = &cinergyt2->status;
856 uint8_t lock_bits; 858 uint8_t lock_bits;
@@ -894,7 +896,7 @@ static int cinergyt2_probe (struct usb_interface *intf,
894 896
895 mutex_init(&cinergyt2->sem); 897 mutex_init(&cinergyt2->sem);
896 init_waitqueue_head (&cinergyt2->poll_wq); 898 init_waitqueue_head (&cinergyt2->poll_wq);
897 INIT_WORK(&cinergyt2->query_work, cinergyt2_query, cinergyt2); 899 INIT_DELAYED_WORK(&cinergyt2->query_work, cinergyt2_query);
898 900
899 cinergyt2->udev = interface_to_usbdev(intf); 901 cinergyt2->udev = interface_to_usbdev(intf);
900 cinergyt2->param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS; 902 cinergyt2->param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;