Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5660e7427113eff85ae712af9cf98c8c5bd368e3

Authored by H Hartley Sweeten
Committed by Greg Kroah-Hartman
1 parent dd671a3948
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

staging: comedi: use EXPORT_SYMBOL_GPL() for all exported symbols 

Comedi is licensed under GPL. Some if its exports are currently
EXPORT_SYMBOL() and others are EXPORT_SYMBOL_GPL(). Change them all
to EXPORT_SYMBOL_GPL() and see if anyone reports any fall out.

If any of the symbols "need" to be EXPORT_SYMBOL() they will be
addressed as needed.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 8 changed files with 61 additions and 61 deletions Side-by-side Diff

drivers/staging/comedi/comedi_buf.c
Diff comments   View file @ 5660e74
... ... @@ -192,7 +192,7 @@
192 192 {
193 193 return __comedi_buf_write_alloc(async, nbytes, 0);
194 194 }
195   -EXPORT_SYMBOL(comedi_buf_write_alloc);
  195 +EXPORT_SYMBOL_GPL(comedi_buf_write_alloc);
196 196  
197 197 /*
198 198 * munging is applied to data by core as it passes between user
... ... @@ -263,7 +263,7 @@
263 263  
264 264 return nbytes;
265 265 }
266   -EXPORT_SYMBOL(comedi_buf_write_free);
  266 +EXPORT_SYMBOL_GPL(comedi_buf_write_free);
267 267  
268 268 unsigned int comedi_buf_read_n_available(struct comedi_async *async)
269 269 {
... ... @@ -282,7 +282,7 @@
282 282  
283 283 return num_bytes;
284 284 }
285   -EXPORT_SYMBOL(comedi_buf_read_n_available);
  285 +EXPORT_SYMBOL_GPL(comedi_buf_read_n_available);
286 286  
287 287 /* allocates a chunk for the reader from filled (and munged) buffer space */
288 288 unsigned int comedi_buf_read_alloc(struct comedi_async *async,
... ... @@ -304,7 +304,7 @@
304 304  
305 305 return nbytes;
306 306 }
307   -EXPORT_SYMBOL(comedi_buf_read_alloc);
  307 +EXPORT_SYMBOL_GPL(comedi_buf_read_alloc);
308 308  
309 309 static unsigned int comedi_buf_read_n_allocated(struct comedi_async *async)
310 310 {
... ... @@ -332,7 +332,7 @@
332 332 async->buf_read_ptr %= async->prealloc_bufsz;
333 333 return nbytes;
334 334 }
335   -EXPORT_SYMBOL(comedi_buf_read_free);
  335 +EXPORT_SYMBOL_GPL(comedi_buf_read_free);
336 336  
337 337 int comedi_buf_put(struct comedi_async *async, short x)
338 338 {
... ... @@ -346,7 +346,7 @@
346 346 comedi_buf_write_free(async, sizeof(short));
347 347 return 1;
348 348 }
349   -EXPORT_SYMBOL(comedi_buf_put);
  349 +EXPORT_SYMBOL_GPL(comedi_buf_put);
350 350  
351 351 int comedi_buf_get(struct comedi_async *async, short *x)
352 352 {
... ... @@ -359,7 +359,7 @@
359 359 comedi_buf_read_free(async, sizeof(short));
360 360 return 1;
361 361 }
362   -EXPORT_SYMBOL(comedi_buf_get);
  362 +EXPORT_SYMBOL_GPL(comedi_buf_get);
363 363  
364 364 void comedi_buf_memcpy_to(struct comedi_async *async, unsigned int offset,
365 365 const void *data, unsigned int num_bytes)
... ... @@ -385,7 +385,7 @@
385 385 write_ptr = 0;
386 386 }
387 387 }
388   -EXPORT_SYMBOL(comedi_buf_memcpy_to);
  388 +EXPORT_SYMBOL_GPL(comedi_buf_memcpy_to);
389 389  
390 390 void comedi_buf_memcpy_from(struct comedi_async *async, unsigned int offset,
391 391 void *dest, unsigned int nbytes)
... ... @@ -412,5 +412,5 @@
412 412 read_ptr = 0;
413 413 }
414 414 }
415   -EXPORT_SYMBOL(comedi_buf_memcpy_from);
  415 +EXPORT_SYMBOL_GPL(comedi_buf_memcpy_from);
drivers/staging/comedi/comedi_fops.c
Diff comments   View file @ 5660e74
... ... @@ -55,7 +55,7 @@
55 55  
56 56 #ifdef CONFIG_COMEDI_DEBUG
57 57 int comedi_debug;
58   -EXPORT_SYMBOL(comedi_debug);
  58 +EXPORT_SYMBOL_GPL(comedi_debug);
59 59 module_param(comedi_debug, int, S_IRUGO | S_IWUSR);
60 60 MODULE_PARM_DESC(comedi_debug,
61 61 "enable comedi core and driver debugging if non-zero (default 0)"
... ... @@ -2344,7 +2344,7 @@
2344 2344 {
2345 2345 dev_err(dev->class_dev, "%s: %s\n", dev->driver->driver_name, s);
2346 2346 }
2347   -EXPORT_SYMBOL(comedi_error);
  2347 +EXPORT_SYMBOL_GPL(comedi_error);
2348 2348  
2349 2349 void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
2350 2350 {
... ... @@ -2387,7 +2387,7 @@
2387 2387 }
2388 2388 s->async->events = 0;
2389 2389 }
2390   -EXPORT_SYMBOL(comedi_event);
  2390 +EXPORT_SYMBOL_GPL(comedi_event);
2391 2391  
2392 2392 /* Note: the ->mutex is pre-locked on successful return */
2393 2393 struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device)
drivers/staging/comedi/drivers.c
Diff comments   View file @ 5660e74
... ... @@ -494,7 +494,7 @@
494 494  
495 495 return 0;
496 496 }
497   -EXPORT_SYMBOL(comedi_driver_register);
  497 +EXPORT_SYMBOL_GPL(comedi_driver_register);
498 498  
499 499 int comedi_driver_unregister(struct comedi_driver *driver)
500 500 {
... ... @@ -532,5 +532,5 @@
532 532 }
533 533 return -EINVAL;
534 534 }
535   -EXPORT_SYMBOL(comedi_driver_unregister);
  535 +EXPORT_SYMBOL_GPL(comedi_driver_unregister);
drivers/staging/comedi/drivers/8255.c
Diff comments   View file @ 5660e74
... ... @@ -129,7 +129,7 @@
129 129  
130 130 comedi_event(dev, s);
131 131 }
132   -EXPORT_SYMBOL(subdev_8255_interrupt);
  132 +EXPORT_SYMBOL_GPL(subdev_8255_interrupt);
133 133  
134 134 static int subdev_8255_insn(struct comedi_device *dev,
135 135 struct comedi_subdevice *s,
... ... @@ -314,7 +314,7 @@
314 314  
315 315 return 0;
316 316 }
317   -EXPORT_SYMBOL(subdev_8255_init);
  317 +EXPORT_SYMBOL_GPL(subdev_8255_init);
318 318  
319 319 int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s,
320 320 int (*io) (int, int, int, unsigned long),
321 321  
... ... @@ -332,13 +332,13 @@
332 332  
333 333 return 0;
334 334 }
335   -EXPORT_SYMBOL(subdev_8255_init_irq);
  335 +EXPORT_SYMBOL_GPL(subdev_8255_init_irq);
336 336  
337 337 void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice *s)
338 338 {
339 339 kfree(s->private);
340 340 }
341   -EXPORT_SYMBOL(subdev_8255_cleanup);
  341 +EXPORT_SYMBOL_GPL(subdev_8255_cleanup);
342 342  
343 343 /*
344 344  
drivers/staging/comedi/drivers/comedi_fc.c
Diff comments   View file @ 5660e74
... ... @@ -65,7 +65,7 @@
65 65  
66 66 return num_bytes;
67 67 }
68   -EXPORT_SYMBOL(cfc_write_array_to_buffer);
  68 +EXPORT_SYMBOL_GPL(cfc_write_array_to_buffer);
69 69  
70 70 unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *subd,
71 71 void *data, unsigned int num_bytes)
... ... @@ -83,7 +83,7 @@
83 83  
84 84 return num_bytes;
85 85 }
86   -EXPORT_SYMBOL(cfc_read_array_from_buffer);
  86 +EXPORT_SYMBOL_GPL(cfc_read_array_from_buffer);
87 87  
88 88 unsigned int cfc_handle_events(struct comedi_device *dev,
89 89 struct comedi_subdevice *subd)
... ... @@ -100,7 +100,7 @@
100 100  
101 101 return events;
102 102 }
103   -EXPORT_SYMBOL(cfc_handle_events);
  103 +EXPORT_SYMBOL_GPL(cfc_handle_events);
104 104  
105 105 MODULE_AUTHOR("Frank Mori Hess <fmhess@users.sourceforge.net>");
106 106 MODULE_DESCRIPTION("Shared functions for Comedi low-level drivers");
drivers/staging/comedi/drivers/mite.c
Diff comments   View file @ 5660e74
... ... @@ -77,7 +77,7 @@
77 77 }
78 78 return mite;
79 79 }
80   -EXPORT_SYMBOL(mite_alloc);
  80 +EXPORT_SYMBOL_GPL(mite_alloc);
81 81  
82 82 static void dump_chip_signature(u32 csigr_bits)
83 83 {
84 84  
... ... @@ -169,13 +169,13 @@
169 169 dev_info(&mite->pcidev->dev, "fifo size is %i.\n", mite->fifo_size);
170 170 return 0;
171 171 }
172   -EXPORT_SYMBOL(mite_setup2);
  172 +EXPORT_SYMBOL_GPL(mite_setup2);
173 173  
174 174 int mite_setup(struct mite_struct *mite)
175 175 {
176 176 return mite_setup2(mite, 0);
177 177 }
178   -EXPORT_SYMBOL(mite_setup);
  178 +EXPORT_SYMBOL_GPL(mite_setup);
179 179  
180 180 void mite_unsetup(struct mite_struct *mite)
181 181 {
... ... @@ -195,7 +195,7 @@
195 195 if (mite->mite_phys_addr)
196 196 mite->mite_phys_addr = 0;
197 197 }
198   -EXPORT_SYMBOL(mite_unsetup);
  198 +EXPORT_SYMBOL_GPL(mite_unsetup);
199 199  
200 200 struct mite_dma_descriptor_ring *mite_alloc_ring(struct mite_struct *mite)
201 201 {
... ... @@ -214,7 +214,7 @@
214 214 ring->descriptors_dma_addr = 0;
215 215 return ring;
216 216 };
217   -EXPORT_SYMBOL(mite_alloc_ring);
  217 +EXPORT_SYMBOL_GPL(mite_alloc_ring);
218 218  
219 219 void mite_free_ring(struct mite_dma_descriptor_ring *ring)
220 220 {
... ... @@ -230,7 +230,7 @@
230 230 kfree(ring);
231 231 }
232 232 };
233   -EXPORT_SYMBOL(mite_free_ring);
  233 +EXPORT_SYMBOL_GPL(mite_free_ring);
234 234  
235 235 struct mite_channel *mite_request_channel_in_range(struct mite_struct *mite,
236 236 struct
... ... @@ -257,7 +257,7 @@
257 257 spin_unlock_irqrestore(&mite->lock, flags);
258 258 return channel;
259 259 }
260   -EXPORT_SYMBOL(mite_request_channel_in_range);
  260 +EXPORT_SYMBOL_GPL(mite_request_channel_in_range);
261 261  
262 262 void mite_release_channel(struct mite_channel *mite_chan)
263 263 {
... ... @@ -284,7 +284,7 @@
284 284 }
285 285 spin_unlock_irqrestore(&mite->lock, flags);
286 286 }
287   -EXPORT_SYMBOL(mite_release_channel);
  287 +EXPORT_SYMBOL_GPL(mite_release_channel);
288 288  
289 289 void mite_dma_arm(struct mite_channel *mite_chan)
290 290 {
... ... @@ -307,7 +307,7 @@
307 307 spin_unlock_irqrestore(&mite->lock, flags);
308 308 /* mite_dma_tcr(mite, channel); */
309 309 }
310   -EXPORT_SYMBOL(mite_dma_arm);
  310 +EXPORT_SYMBOL_GPL(mite_dma_arm);
311 311  
312 312 /**************************************/
313 313  
... ... @@ -364,7 +364,7 @@
364 364 smp_wmb();
365 365 return 0;
366 366 }
367   -EXPORT_SYMBOL(mite_buf_change);
  367 +EXPORT_SYMBOL_GPL(mite_buf_change);
368 368  
369 369 void mite_prep_dma(struct mite_channel *mite_chan,
370 370 unsigned int num_device_bits, unsigned int num_memory_bits)
... ... @@ -455,7 +455,7 @@
455 455  
456 456 MDPRINTK("exit mite_prep_dma\n");
457 457 }
458   -EXPORT_SYMBOL(mite_prep_dma);
  458 +EXPORT_SYMBOL_GPL(mite_prep_dma);
459 459  
460 460 static u32 mite_device_bytes_transferred(struct mite_channel *mite_chan)
461 461 {
... ... @@ -469,7 +469,7 @@
469 469 return readl(mite->mite_io_addr +
470 470 MITE_FCR(mite_chan->channel)) & 0x000000FF;
471 471 }
472   -EXPORT_SYMBOL(mite_bytes_in_transit);
  472 +EXPORT_SYMBOL_GPL(mite_bytes_in_transit);
473 473  
474 474 /* returns lower bound for number of bytes transferred from device to memory */
475 475 u32 mite_bytes_written_to_memory_lb(struct mite_channel *mite_chan)
... ... @@ -479,7 +479,7 @@
479 479 device_byte_count = mite_device_bytes_transferred(mite_chan);
480 480 return device_byte_count - mite_bytes_in_transit(mite_chan);
481 481 }
482   -EXPORT_SYMBOL(mite_bytes_written_to_memory_lb);
  482 +EXPORT_SYMBOL_GPL(mite_bytes_written_to_memory_lb);
483 483  
484 484 /* returns upper bound for number of bytes transferred from device to memory */
485 485 u32 mite_bytes_written_to_memory_ub(struct mite_channel *mite_chan)
... ... @@ -489,7 +489,7 @@
489 489 in_transit_count = mite_bytes_in_transit(mite_chan);
490 490 return mite_device_bytes_transferred(mite_chan) - in_transit_count;
491 491 }
492   -EXPORT_SYMBOL(mite_bytes_written_to_memory_ub);
  492 +EXPORT_SYMBOL_GPL(mite_bytes_written_to_memory_ub);
493 493  
494 494 /* returns lower bound for number of bytes read from memory to device */
495 495 u32 mite_bytes_read_from_memory_lb(struct mite_channel *mite_chan)
... ... @@ -499,7 +499,7 @@
499 499 device_byte_count = mite_device_bytes_transferred(mite_chan);
500 500 return device_byte_count + mite_bytes_in_transit(mite_chan);
501 501 }
502   -EXPORT_SYMBOL(mite_bytes_read_from_memory_lb);
  502 +EXPORT_SYMBOL_GPL(mite_bytes_read_from_memory_lb);
503 503  
504 504 /* returns upper bound for number of bytes read from memory to device */
505 505 u32 mite_bytes_read_from_memory_ub(struct mite_channel *mite_chan)
... ... @@ -509,7 +509,7 @@
509 509 in_transit_count = mite_bytes_in_transit(mite_chan);
510 510 return mite_device_bytes_transferred(mite_chan) + in_transit_count;
511 511 }
512   -EXPORT_SYMBOL(mite_bytes_read_from_memory_ub);
  512 +EXPORT_SYMBOL_GPL(mite_bytes_read_from_memory_ub);
513 513  
514 514 unsigned mite_dma_tcr(struct mite_channel *mite_chan)
515 515 {
... ... @@ -524,7 +524,7 @@
524 524  
525 525 return tcr;
526 526 }
527   -EXPORT_SYMBOL(mite_dma_tcr);
  527 +EXPORT_SYMBOL_GPL(mite_dma_tcr);
528 528  
529 529 void mite_dma_disarm(struct mite_channel *mite_chan)
530 530 {
... ... @@ -535,7 +535,7 @@
535 535 chor = CHOR_ABORT;
536 536 writel(chor, mite->mite_io_addr + MITE_CHOR(mite_chan->channel));
537 537 }
538   -EXPORT_SYMBOL(mite_dma_disarm);
  538 +EXPORT_SYMBOL_GPL(mite_dma_disarm);
539 539  
540 540 int mite_sync_input_dma(struct mite_channel *mite_chan,
541 541 struct comedi_async *async)
... ... @@ -573,7 +573,7 @@
573 573 async->events |= COMEDI_CB_BLOCK;
574 574 return 0;
575 575 }
576   -EXPORT_SYMBOL(mite_sync_input_dma);
  576 +EXPORT_SYMBOL_GPL(mite_sync_input_dma);
577 577  
578 578 int mite_sync_output_dma(struct mite_channel *mite_chan,
579 579 struct comedi_async *async)
... ... @@ -611,7 +611,7 @@
611 611 }
612 612 return 0;
613 613 }
614   -EXPORT_SYMBOL(mite_sync_output_dma);
  614 +EXPORT_SYMBOL_GPL(mite_sync_output_dma);
615 615  
616 616 unsigned mite_get_status(struct mite_channel *mite_chan)
617 617 {
... ... @@ -630,7 +630,7 @@
630 630 spin_unlock_irqrestore(&mite->lock, flags);
631 631 return status;
632 632 }
633   -EXPORT_SYMBOL(mite_get_status);
  633 +EXPORT_SYMBOL_GPL(mite_get_status);
634 634  
635 635 int mite_done(struct mite_channel *mite_chan)
636 636 {
... ... @@ -644,7 +644,7 @@
644 644 spin_unlock_irqrestore(&mite->lock, flags);
645 645 return done;
646 646 }
647   -EXPORT_SYMBOL(mite_done);
  647 +EXPORT_SYMBOL_GPL(mite_done);
648 648  
649 649 #ifdef DEBUG_MITE
650 650  
... ... @@ -777,7 +777,7 @@
777 777 value = readl(mite_io_addr + offset);
778 778 pr_debug("mite status[FCR] at 0x%08x =0x%08x\n", offset, value);
779 779 }
780   -EXPORT_SYMBOL(mite_dump_regs);
  780 +EXPORT_SYMBOL_GPL(mite_dump_regs);
781 781 #endif
782 782  
783 783 static int __init mite_module_init(void)
drivers/staging/comedi/kcomedilib/kcomedilib_main.c
Diff comments   View file @ 5660e74
... ... @@ -63,7 +63,7 @@
63 63  
64 64 return dev;
65 65 }
66   -EXPORT_SYMBOL(comedi_open);
  66 +EXPORT_SYMBOL_GPL(comedi_open);
67 67  
68 68 int comedi_close(struct comedi_device *d)
69 69 {
... ... @@ -73,7 +73,7 @@
73 73  
74 74 return 0;
75 75 }
76   -EXPORT_SYMBOL(comedi_close);
  76 +EXPORT_SYMBOL_GPL(comedi_close);
77 77  
78 78 static int comedi_do_insn(struct comedi_device *dev,
79 79 struct comedi_insn *insn,
... ... @@ -143,7 +143,7 @@
143 143  
144 144 return comedi_do_insn(dev, &insn, &io);
145 145 }
146   -EXPORT_SYMBOL(comedi_dio_config);
  146 +EXPORT_SYMBOL_GPL(comedi_dio_config);
147 147  
148 148 int comedi_dio_bitfield(struct comedi_device *dev, unsigned int subdev,
149 149 unsigned int mask, unsigned int *bits)
... ... @@ -166,7 +166,7 @@
166 166  
167 167 return ret;
168 168 }
169   -EXPORT_SYMBOL(comedi_dio_bitfield);
  169 +EXPORT_SYMBOL_GPL(comedi_dio_bitfield);
170 170  
171 171 int comedi_find_subdevice_by_type(struct comedi_device *dev, int type,
172 172 unsigned int subd)
... ... @@ -183,7 +183,7 @@
183 183 }
184 184 return -1;
185 185 }
186   -EXPORT_SYMBOL(comedi_find_subdevice_by_type);
  186 +EXPORT_SYMBOL_GPL(comedi_find_subdevice_by_type);
187 187  
188 188 int comedi_get_n_channels(struct comedi_device *dev, unsigned int subdevice)
189 189 {
... ... @@ -191,5 +191,5 @@
191 191  
192 192 return s->n_chan;
193 193 }
194   -EXPORT_SYMBOL(comedi_get_n_channels);
  194 +EXPORT_SYMBOL_GPL(comedi_get_n_channels);
drivers/staging/comedi/range.c
Diff comments   View file @ 5660e74
... ... @@ -26,25 +26,25 @@
26 26 #include "comedi_internal.h"
27 27  
28 28 const struct comedi_lrange range_bipolar10 = { 1, {BIP_RANGE(10)} };
29   -EXPORT_SYMBOL(range_bipolar10);
  29 +EXPORT_SYMBOL_GPL(range_bipolar10);
30 30 const struct comedi_lrange range_bipolar5 = { 1, {BIP_RANGE(5)} };
31   -EXPORT_SYMBOL(range_bipolar5);
  31 +EXPORT_SYMBOL_GPL(range_bipolar5);
32 32 const struct comedi_lrange range_bipolar2_5 = { 1, {BIP_RANGE(2.5)} };
33   -EXPORT_SYMBOL(range_bipolar2_5);
  33 +EXPORT_SYMBOL_GPL(range_bipolar2_5);
34 34 const struct comedi_lrange range_unipolar10 = { 1, {UNI_RANGE(10)} };
35   -EXPORT_SYMBOL(range_unipolar10);
  35 +EXPORT_SYMBOL_GPL(range_unipolar10);
36 36 const struct comedi_lrange range_unipolar5 = { 1, {UNI_RANGE(5)} };
37   -EXPORT_SYMBOL(range_unipolar5);
  37 +EXPORT_SYMBOL_GPL(range_unipolar5);
38 38 const struct comedi_lrange range_unipolar2_5 = { 1, {UNI_RANGE(2.5)} };
39   -EXPORT_SYMBOL(range_unipolar2_5);
  39 +EXPORT_SYMBOL_GPL(range_unipolar2_5);
40 40 const struct comedi_lrange range_0_20mA = { 1, {RANGE_mA(0, 20)} };
41   -EXPORT_SYMBOL(range_0_20mA);
  41 +EXPORT_SYMBOL_GPL(range_0_20mA);
42 42 const struct comedi_lrange range_4_20mA = { 1, {RANGE_mA(4, 20)} };
43   -EXPORT_SYMBOL(range_4_20mA);
  43 +EXPORT_SYMBOL_GPL(range_4_20mA);
44 44 const struct comedi_lrange range_0_32mA = { 1, {RANGE_mA(0, 32)} };
45   -EXPORT_SYMBOL(range_0_32mA);
  45 +EXPORT_SYMBOL_GPL(range_0_32mA);
46 46 const struct comedi_lrange range_unknown = { 1, {{0, 1000000, UNIT_none} } };
47   -EXPORT_SYMBOL(range_unknown);
  47 +EXPORT_SYMBOL_GPL(range_unknown);
48 48  
49 49 /*
50 50 COMEDI_RANGEINFO
... ... @@ -173,5 +173,5 @@
173 173 }
174 174 return 0;
175 175 }
176   -EXPORT_SYMBOL(comedi_check_chanlist);
  176 +EXPORT_SYMBOL_GPL(comedi_check_chanlist);