aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-02-28 01:42:34 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 17:54:26 -0400
commit766f9d20a1b1fcf5c84b3eb1d96f35a4d882cdeb (patch)
tree89e10a662e142d4df5fb5e8efc1940b6f87ff026
parent36445bc118848df0eed1e2da400b2b66041a2c9c (diff)
Staging: line6: fix checkpatch errors in dumprequest.c
Lots of warnings also fixed up. Cc: Markus Grabner <grabner@icg.tugraz.at> Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/line6/dumprequest.c40
1 files changed, 24 insertions, 16 deletions
diff --git a/drivers/staging/line6/dumprequest.c b/drivers/staging/line6/dumprequest.c
index 89bc0994d07b..decbaa971b68 100644
--- a/drivers/staging/line6/dumprequest.c
+++ b/drivers/staging/line6/dumprequest.c
@@ -42,13 +42,15 @@ void line6_dump_finished(struct line6_dump_request *l6dr)
42/* 42/*
43 Send an asynchronous channel dump request. 43 Send an asynchronous channel dump request.
44*/ 44*/
45int line6_dump_request_async(struct line6_dump_request *l6dr, struct usb_line6 *line6, int num) 45int line6_dump_request_async(struct line6_dump_request *l6dr,
46 struct usb_line6 *line6, int num)
46{ 47{
47 int ret; 48 int ret;
48 line6_invalidate_current(l6dr); 49 line6_invalidate_current(l6dr);
49 ret = line6_send_raw_message_async(line6, l6dr->reqbufs[num].buffer, l6dr->reqbufs[num].length); 50 ret = line6_send_raw_message_async(line6, l6dr->reqbufs[num].buffer,
51 l6dr->reqbufs[num].length);
50 52
51 if(ret < 0) 53 if (ret < 0)
52 line6_dump_finished(l6dr); 54 line6_dump_finished(l6dr);
53 55
54 return ret; 56 return ret;
@@ -58,7 +60,7 @@ int line6_dump_request_async(struct line6_dump_request *l6dr, struct usb_line6 *
58 Send an asynchronous dump request after a given interval. 60 Send an asynchronous dump request after a given interval.
59*/ 61*/
60void line6_startup_delayed(struct line6_dump_request *l6dr, int seconds, 62void line6_startup_delayed(struct line6_dump_request *l6dr, int seconds,
61 void (*function)(unsigned long), void *data) 63 void (*function)(unsigned long), void *data)
62{ 64{
63 l6dr->timer.expires = jiffies + seconds * HZ; 65 l6dr->timer.expires = jiffies + seconds * HZ;
64 l6dr->timer.function = function; 66 l6dr->timer.function = function;
@@ -76,17 +78,16 @@ int line6_wait_dump(struct line6_dump_request *l6dr, int nonblock)
76 add_wait_queue(&l6dr->wait, &wait); 78 add_wait_queue(&l6dr->wait, &wait);
77 current->state = TASK_INTERRUPTIBLE; 79 current->state = TASK_INTERRUPTIBLE;
78 80
79 while(l6dr->in_progress) { 81 while (l6dr->in_progress) {
80 if(nonblock) { 82 if (nonblock) {
81 retval = -EAGAIN; 83 retval = -EAGAIN;
82 break; 84 break;
83 } 85 }
84 86
85 if(signal_pending(current)) { 87 if (signal_pending(current)) {
86 retval = -ERESTARTSYS; 88 retval = -ERESTARTSYS;
87 break; 89 break;
88 } 90 } else
89 else
90 schedule(); 91 schedule();
91 } 92 }
92 93
@@ -98,10 +99,12 @@ int line6_wait_dump(struct line6_dump_request *l6dr, int nonblock)
98/* 99/*
99 Initialize dump request buffer. 100 Initialize dump request buffer.
100*/ 101*/
101int line6_dumpreq_initbuf(struct line6_dump_request *l6dr, const void *buf, size_t len, int num) 102int line6_dumpreq_initbuf(struct line6_dump_request *l6dr, const void *buf,
103 size_t len, int num)
102{ 104{
103 l6dr->reqbufs[num].buffer = kmalloc(len, GFP_KERNEL); 105 l6dr->reqbufs[num].buffer = kmalloc(len, GFP_KERNEL);
104 if(l6dr->reqbufs[num].buffer == NULL) return -ENOMEM; 106 if (l6dr->reqbufs[num].buffer == NULL)
107 return -ENOMEM;
105 memcpy(l6dr->reqbufs[num].buffer, buf, len); 108 memcpy(l6dr->reqbufs[num].buffer, buf, len);
106 l6dr->reqbufs[num].length = len; 109 l6dr->reqbufs[num].length = len;
107 return 0; 110 return 0;
@@ -110,11 +113,13 @@ int line6_dumpreq_initbuf(struct line6_dump_request *l6dr, const void *buf, size
110/* 113/*
111 Initialize dump request data structure (including one buffer). 114 Initialize dump request data structure (including one buffer).
112*/ 115*/
113int line6_dumpreq_init(struct line6_dump_request *l6dr, const void *buf, size_t len) 116int line6_dumpreq_init(struct line6_dump_request *l6dr, const void *buf,
117 size_t len)
114{ 118{
115 int ret; 119 int ret;
116 ret = line6_dumpreq_initbuf(l6dr, buf, len, 0); 120 ret = line6_dumpreq_initbuf(l6dr, buf, len, 0);
117 if(ret < 0) return ret; 121 if (ret < 0)
122 return ret;
118 init_waitqueue_head(&l6dr->wait); 123 init_waitqueue_head(&l6dr->wait);
119 init_timer(&l6dr->timer); 124 init_timer(&l6dr->timer);
120 return 0; 125 return 0;
@@ -125,8 +130,10 @@ int line6_dumpreq_init(struct line6_dump_request *l6dr, const void *buf, size_t
125*/ 130*/
126void line6_dumpreq_destructbuf(struct line6_dump_request *l6dr, int num) 131void line6_dumpreq_destructbuf(struct line6_dump_request *l6dr, int num)
127{ 132{
128 if(l6dr == NULL) return; 133 if (l6dr == NULL)
129 if(l6dr->reqbufs[num].buffer == NULL) return; 134 return;
135 if (l6dr->reqbufs[num].buffer == NULL)
136 return;
130 kfree(l6dr->reqbufs[num].buffer); 137 kfree(l6dr->reqbufs[num].buffer);
131 l6dr->reqbufs[num].buffer = NULL; 138 l6dr->reqbufs[num].buffer = NULL;
132} 139}
@@ -136,7 +143,8 @@ void line6_dumpreq_destructbuf(struct line6_dump_request *l6dr, int num)
136*/ 143*/
137void line6_dumpreq_destruct(struct line6_dump_request *l6dr) 144void line6_dumpreq_destruct(struct line6_dump_request *l6dr)
138{ 145{
139 if(l6dr->reqbufs[0].buffer == NULL) return; 146 if (l6dr->reqbufs[0].buffer == NULL)
147 return;
140 line6_dumpreq_destructbuf(l6dr, 0); 148 line6_dumpreq_destructbuf(l6dr, 0);
141 l6dr->ok = 1; 149 l6dr->ok = 1;
142 del_timer_sync(&l6dr->timer); 150 del_timer_sync(&l6dr->timer);