Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b

Authored by Linus Torvalds
2 parents 548453fd10 838cb6aba4
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
  DOC:  A couple corrections and clarifications in USB doc.
  Generate a slightly more informative error msg for bad HZ
  fix typo "is" -> "if" in Makefile
  ext*: spelling fix prefered -> preferred
  DOCUMENTATION:  Use newer DEFINE_SPINLOCK macro in docs.
  KEYS:  Fix the comment to match the file name in rxrpc-type.h.
  RAID: remove trailing space from printk line
  DMA engine: typo fixes
  Remove unused MAX_NODES_SHIFT
  MAINTAINERS: Clarify access to OCFS2 development mailing list.
  V4L: Storage class should be before const qualifier (sn9c102)
  V4L: Storage class should be before const qualifier
  sonypi: Storage class should be before const qualifier
  intel_menlow: Storage class should be before const qualifier
  DVB: Storage class should be before const qualifier
  arm: Storage class should be before const qualifier
  ALSA: Storage class should be before const qualifier
  acpi: Storage class should be before const qualifier
  firmware_sample_driver.c: fix coding style
  MAINTAINERS: Add ati_remote2 driver
  ...

Fixed up trivial conflicts in firmware_sample_driver.c

Showing 37 changed files Side-by-side Diff

Documentation/DocBook/kernel-locking.tmpl
Diff comments   View file @ e9b6269
... ... @@ -854,7 +854,7 @@
854 854 };
855 855  
856 856 -static DEFINE_MUTEX(cache_lock);
857   -+static spinlock_t cache_lock = SPIN_LOCK_UNLOCKED;
  857 ++static DEFINE_SPINLOCK(cache_lock);
858 858 static LIST_HEAD(cache);
859 859 static unsigned int cache_num = 0;
860 860 #define MAX_CACHE_SIZE 10
... ... @@ -1238,7 +1238,7 @@
1238 1238 - int popularity;
1239 1239 };
1240 1240  
1241   - static spinlock_t cache_lock = SPIN_LOCK_UNLOCKED;
  1241 + static DEFINE_SPINLOCK(cache_lock);
1242 1242 @@ -77,6 +84,7 @@
1243 1243 obj->id = id;
1244 1244 obj->popularity = 0;
Documentation/DocBook/writing_usb_driver.tmpl
Diff comments   View file @ e9b6269
... ... @@ -100,8 +100,8 @@
100 100 useful documents, at the USB home page (see Resources). An excellent
101 101 introduction to the Linux USB subsystem can be found at the USB Working
102 102 Devices List (see Resources). It explains how the Linux USB subsystem is
103   - structured and introduces the reader to the concept of USB urbs, which
104   - are essential to USB drivers.
  103 + structured and introduces the reader to the concept of USB urbs
  104 + (USB Request Blocks), which are essential to USB drivers.
105 105 </para>
106 106 <para>
107 107 The first thing a Linux USB driver needs to do is register itself with
... ... @@ -162,8 +162,8 @@
162 162 module_init(usb_skel_init);
163 163 </programlisting>
164 164 <para>
165   - When the driver is unloaded from the system, it needs to unregister
166   - itself with the USB subsystem. This is done with the usb_unregister
  165 + When the driver is unloaded from the system, it needs to deregister
  166 + itself with the USB subsystem. This is done with the usb_deregister
167 167 function:
168 168 </para>
169 169 <programlisting>
... ... @@ -232,7 +232,7 @@
232 232 were passed to the USB subsystem will be called from a user program trying
233 233 to talk to the device. The first function called will be open, as the
234 234 program tries to open the device for I/O. We increment our private usage
235   - count and save off a pointer to our internal structure in the file
  235 + count and save a pointer to our internal structure in the file
236 236 structure. This is done so that future calls to file operations will
237 237 enable the driver to determine which device the user is addressing. All
238 238 of this is done with the following code:
... ... @@ -252,8 +252,8 @@
252 252 send to the device based on the size of the write urb it has created (this
253 253 size depends on the size of the bulk out end point that the device has).
254 254 Then it copies the data from user space to kernel space, points the urb to
255   - the data and submits the urb to the USB subsystem. This can be shown in
256   - he following code:
  255 + the data and submits the urb to the USB subsystem. This can be seen in
  256 + the following code:
257 257 </para>
258 258 <programlisting>
259 259 /* we can only write as much as 1 urb will hold */
Documentation/SubmittingPatches
Diff comments   View file @ e9b6269
... ... @@ -183,7 +183,7 @@
183 183 copy the maintainer when you change their code.
184 184  
185 185 For small patches you may want to CC the Trivial Patch Monkey
186   -trivial@kernel.org managed by Adrian Bunk; which collects "trivial"
  186 +trivial@kernel.org managed by Jesper Juhl; which collects "trivial"
187 187 patches. Trivial patches must qualify for one of the following rules:
188 188 Spelling fixes in documentation
189 189 Spelling fixes which could break grep(1)
... ... @@ -196,7 +196,7 @@
196 196 since people copy, as long as it's trivial)
197 197 Any fix by the author/maintainer of the file (ie. patch monkey
198 198 in re-transmission mode)
199   -URL: <http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/>
  199 +URL: <http://www.kernel.org/pub/linux/kernel/people/juhl/trivial/>
200 200  
201 201  
202 202  
Documentation/block/biodoc.txt
Diff comments   View file @ e9b6269
... ... @@ -1097,7 +1097,7 @@
1097 1097 io_request_lock for serialization need to be modified accordingly.
1098 1098 Usually it's as easy as adding a global lock:
1099 1099  
1100   - static spinlock_t my_driver_lock = SPIN_LOCK_UNLOCKED;
  1100 + static DEFINE_SPINLOCK(my_driver_lock);
1101 1101  
1102 1102 and passing the address to that lock to blk_init_queue().
1103 1103  
Documentation/cli-sti-removal.txt
Diff comments   View file @ e9b6269
... ... @@ -43,7 +43,7 @@
43 43  
44 44 but from now on a more direct method of locking has to be used:
45 45  
46   - spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
  46 + DEFINE_SPINLOCK(driver_lock);
47 47 struct driver_data;
48 48  
49 49 irq_handler (...)
Documentation/dontdiff
Diff comments   View file @ e9b6269
... ... @@ -47,7 +47,6 @@
47 47 .mm
48 48 53c700_d.h
49 49 53c8xx_d.h*
50   -BitKeeper
51 50 COPYING
52 51 CREDITS
53 52 CVS
Documentation/early-userspace/README
Diff comments   View file @ e9b6269
... ... @@ -89,8 +89,8 @@
89 89 You can obtain somewhat infrequent snapshots of klibc from
90 90 ftp://ftp.kernel.org/pub/linux/libs/klibc/
91 91  
92   -For active users, you are better off using the klibc BitKeeper
93   -repositories, at http://klibc.bkbits.net/
  92 +For active users, you are better off using the klibc git
  93 +repository, at http://git.kernel.org/?p=libs/klibc/klibc.git
94 94  
95 95 The standalone klibc distribution currently provides three components,
96 96 in addition to the klibc library:
... ... @@ -684,6 +684,11 @@
684 684 L: ath5k-devel@lists.ath5k.org
685 685 S: Maintained
686 686  
  687 +ATI_REMOTE2 DRIVER
  688 +P: Ville Syrjala
  689 +M: syrjala@sci.fi
  690 +S: Maintained
  691 +
687 692 ATL1 ETHERNET DRIVER
688 693 P: Jay Cliburn
689 694 M: jcliburn@gmail.com
... ... @@ -2947,7 +2952,7 @@
2947 2952 M: mfasheh@suse.com
2948 2953 P: Joel Becker
2949 2954 M: joel.becker@oracle.com
2950   -L: ocfs2-devel@oss.oracle.com
  2955 +L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
2951 2956 W: http://oss.oracle.com/projects/ocfs2/
2952 2957 T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
2953 2958 S: Supported
... ... @@ -1538,7 +1538,7 @@
1538 1538 quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)))
1539 1539 cmd_rmfiles = rm -f $(rm-files)
1540 1540  
1541   -# Run depmod only is we have System.map and depmod is executable
  1541 +# Run depmod only if we have System.map and depmod is executable
1542 1542 # and we build for the host arch
1543 1543 quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
1544 1544 cmd_depmod = \
arch/arm/mach-pxa/mfp-pxa3xx.c
Diff comments   View file @ e9b6269
... ... @@ -42,7 +42,7 @@
42 42 static struct pxa3xx_mfp_pin mfp_table[MFP_PIN_MAX];
43 43  
44 44 /* mapping of MFP_LPM_* definitions to MFPR_LPM_* register bits */
45   -const static unsigned long mfpr_lpm[] = {
  45 +static const unsigned long mfpr_lpm[] = {
46 46 MFPR_LPM_INPUT,
47 47 MFPR_LPM_DRIVE_LOW,
48 48 MFPR_LPM_DRIVE_HIGH,
... ... @@ -52,7 +52,7 @@
52 52 };
53 53  
54 54 /* mapping of MFP_PULL_* definitions to MFPR_PULL_* register bits */
55   -const static unsigned long mfpr_pull[] = {
  55 +static const unsigned long mfpr_pull[] = {
56 56 MFPR_PULL_NONE,
57 57 MFPR_PULL_LOW,
58 58 MFPR_PULL_HIGH,
... ... @@ -60,7 +60,7 @@
60 60 };
61 61  
62 62 /* mapping of MFP_LPM_EDGE_* definitions to MFPR_EDGE_* register bits */
63   -const static unsigned long mfpr_edge[] = {
  63 +static const unsigned long mfpr_edge[] = {
64 64 MFPR_EDGE_NONE,
65 65 MFPR_EDGE_RISE,
66 66 MFPR_EDGE_FALL,
... ... @@ -63,7 +63,7 @@
63 63 static int acpi_ac_remove(struct acpi_device *device, int type);
64 64 static int acpi_ac_resume(struct acpi_device *device);
65 65  
66   -const static struct acpi_device_id ac_device_ids[] = {
  66 +static const struct acpi_device_id ac_device_ids[] = {
67 67 {"ACPI0003", 0},
68 68 {"", 0},
69 69 };
drivers/char/sonypi.c
Diff comments   View file @ e9b6269
... ... @@ -1147,7 +1147,7 @@
1147 1147 return 0;
1148 1148 }
1149 1149  
1150   -const static struct acpi_device_id sonypi_device_ids[] = {
  1150 +static const struct acpi_device_id sonypi_device_ids[] = {
1151 1151 {"SNY6001", 0},
1152 1152 {"", 0},
1153 1153 };
drivers/dma/dmaengine.c
Diff comments   View file @ e9b6269
... ... @@ -42,9 +42,9 @@
42 42 *
43 43 * Each device has a kref, which is initialized to 1 when the device is
44 44 * registered. A kref_get is done for each device registered. When the
45   - * device is released, the coresponding kref_put is done in the release
  45 + * device is released, the corresponding kref_put is done in the release
46 46 * method. Every time one of the device's channels is allocated to a client,
47   - * a kref_get occurs. When the channel is freed, the coresponding kref_put
  47 + * a kref_get occurs. When the channel is freed, the corresponding kref_put
48 48 * happens. The device's release function does a completion, so
49 49 * unregister_device does a remove event, device_unregister, a kref_put
50 50 * for the first reference, then waits on the completion for all other
... ... @@ -53,7 +53,7 @@
53 53 * Each channel has an open-coded implementation of Rusty Russell's "bigref,"
54 54 * with a kref and a per_cpu local_t. A dma_chan_get is called when a client
55 55 * signals that it wants to use a channel, and dma_chan_put is called when
56   - * a channel is removed or a client using it is unregesitered. A client can
  56 + * a channel is removed or a client using it is unregistered. A client can
57 57 * take extra references per outstanding transaction, as is the case with
58 58 * the NET DMA client. The release function does a kref_put on the device.
59 59 * -ChrisL, DanW
... ... @@ -4152,7 +4152,7 @@
4152 4152  
4153 4153 return 0;
4154 4154 busy:
4155   - printk(KERN_WARNING "md: cannot remove active disk %s from %s ... \n",
  4155 + printk(KERN_WARNING "md: cannot remove active disk %s from %s ...\n",
4156 4156 bdevname(rdev->bdev,b), mdname(mddev));
4157 4157 return -EBUSY;
4158 4158 }
drivers/media/dvb/frontends/or51132.c
Diff comments   View file @ e9b6269
... ... @@ -91,7 +91,7 @@
91 91 Less code and more efficient that loading a buffer on the stack with
92 92 the bytes to send and then calling or51132_writebuf() on that. */
93 93 #define or51132_writebytes(state, data...) \
94   - ({ const static u8 _data[] = {data}; \
  94 + ({ static const u8 _data[] = {data}; \
95 95 or51132_writebuf(state, _data, sizeof(_data)); })
96 96  
97 97 /* Read data from demod into buffer. Returns 0 on success. */
... ... @@ -132,7 +132,7 @@
132 132 static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware *fw)
133 133 {
134 134 struct or51132_state* state = fe->demodulator_priv;
135   - const static u8 run_buf[] = {0x7F,0x01};
  135 + static const u8 run_buf[] = {0x7F,0x01};
136 136 u8 rec_buf[8];
137 137 u32 firmwareAsize, firmwareBsize;
138 138 int i,ret;
drivers/media/video/sn9c102/sn9c102_sensor.h
Diff comments   View file @ e9b6269
... ... @@ -126,7 +126,7 @@
126 126 Register adresses must be < 256.
127 127 */
128 128 #define sn9c102_write_const_regs(sn9c102_device, data...) \
129   - ({ const static u8 _valreg[][2] = {data}; \
  129 + ({ static const u8 _valreg[][2] = {data}; \
130 130 sn9c102_write_regs(sn9c102_device, _valreg, ARRAY_SIZE(_valreg)); })
131 131  
132 132 /*****************************************************************************/
drivers/media/video/v4l1-compat.c
Diff comments   View file @ e9b6269
... ... @@ -126,7 +126,7 @@
126 126  
127 127 /* ----------------------------------------------------------------- */
128 128  
129   -const static unsigned int palette2pixelformat[] = {
  129 +static const unsigned int palette2pixelformat[] = {
130 130 [VIDEO_PALETTE_GREY] = V4L2_PIX_FMT_GREY,
131 131 [VIDEO_PALETTE_RGB555] = V4L2_PIX_FMT_RGB555,
132 132 [VIDEO_PALETTE_RGB565] = V4L2_PIX_FMT_RGB565,
drivers/misc/intel_menlow.c
Diff comments   View file @ e9b6269
... ... @@ -213,7 +213,7 @@
213 213 return 0;
214 214 }
215 215  
216   -const static struct acpi_device_id intel_menlow_memory_ids[] = {
  216 +static const struct acpi_device_id intel_menlow_memory_ids[] = {
217 217 {"INT0002", 0},
218 218 {"", 0},
219 219 };
... ... @@ -253,7 +253,7 @@
253 253 * it has too few free inodes left (min_inodes) or
254 254 * it has too few free blocks left (min_blocks) or
255 255 * it's already running too large debt (max_debt).
256   - * Parent's group is prefered, if it doesn't satisfy these
  256 + * Parent's group is preferred, if it doesn't satisfy these
257 257 * conditions we search cyclically through the rest. If none
258 258 * of the groups look good we just look for a group with more
259 259 * free inodes than average (starting at parent's group).
... ... @@ -239,7 +239,7 @@
239 239 * @inode: owner
240 240 * @ind: descriptor of indirect block.
241 241 *
242   - * This function returns the prefered place for block allocation.
  242 + * This function returns the preferred place for block allocation.
243 243 * It is used when heuristic for sequential allocation fails.
244 244 * Rules are:
245 245 * + if there is a block to the left of our position - allocate near it.
... ... @@ -283,7 +283,7 @@
283 283 }
284 284  
285 285 /**
286   - * ext2_find_goal - find a prefered place for allocation.
  286 + * ext2_find_goal - find a preferred place for allocation.
287 287 * @inode: owner
288 288 * @block: block we want
289 289 * @partial: pointer to the last triple within a chain
... ... @@ -239,7 +239,7 @@
239 239 * it has too few free inodes left (min_inodes) or
240 240 * it has too few free blocks left (min_blocks) or
241 241 * it's already running too large debt (max_debt).
242   - * Parent's group is prefered, if it doesn't satisfy these
  242 + * Parent's group is preferred, if it doesn't satisfy these
243 243 * conditions we search cyclically through the rest. If none
244 244 * of the groups look good we just look for a group with more
245 245 * free inodes than average (starting at parent's group).
... ... @@ -392,7 +392,7 @@
392 392 * @inode: owner
393 393 * @ind: descriptor of indirect block.
394 394 *
395   - * This function returns the prefered place for block allocation.
  395 + * This function returns the preferred place for block allocation.
396 396 * It is used when heuristic for sequential allocation fails.
397 397 * Rules are:
398 398 * + if there is a block to the left of our position - allocate near it.
399 399  
... ... @@ -436,12 +436,12 @@
436 436 }
437 437  
438 438 /**
439   - * ext3_find_goal - find a prefered place for allocation.
  439 + * ext3_find_goal - find a preferred place for allocation.
440 440 * @inode: owner
441 441 * @block: block we want
442 442 * @partial: pointer to the last triple within a chain
443 443 *
444   - * Normally this function find the prefered place for block allocation,
  444 + * Normally this function find the preferred place for block allocation,
445 445 * returns it.
446 446 */
447 447  
... ... @@ -305,7 +305,7 @@
305 305 * it has too few free inodes left (min_inodes) or
306 306 * it has too few free blocks left (min_blocks) or
307 307 * it's already running too large debt (max_debt).
308   - * Parent's group is prefered, if it doesn't satisfy these
  308 + * Parent's group is preferred, if it doesn't satisfy these
309 309 * conditions we search cyclically through the rest. If none
310 310 * of the groups look good we just look for a group with more
311 311 * free inodes than average (starting at parent's group).
... ... @@ -382,7 +382,7 @@
382 382 * @inode: owner
383 383 * @ind: descriptor of indirect block.
384 384 *
385   - * This function returns the prefered place for block allocation.
  385 + * This function returns the preferred place for block allocation.
386 386 * It is used when heuristic for sequential allocation fails.
387 387 * Rules are:
388 388 * + if there is a block to the left of our position - allocate near it.
389 389  
... ... @@ -432,12 +432,12 @@
432 432 }
433 433  
434 434 /**
435   - * ext4_find_goal - find a prefered place for allocation.
  435 + * ext4_find_goal - find a preferred place for allocation.
436 436 * @inode: owner
437 437 * @block: block we want
438 438 * @partial: pointer to the last triple within a chain
439 439 *
440   - * Normally this function find the prefered place for block allocation,
  440 + * Normally this function find the preferred place for block allocation,
441 441 * returns it.
442 442 */
443 443 static ext4_fsblk_t ext4_find_goal(struct inode *inode, ext4_lblk_t block,
... ... @@ -260,7 +260,7 @@
260 260 wait = NULL;
261 261 if (retval || !*timeout || signal_pending(current))
262 262 break;
263   - if(table.error) {
  263 + if (table.error) {
264 264 retval = table.error;
265 265 break;
266 266 }
include/asm-arm/hardware/iop3xx-adma.h
Diff comments   View file @ e9b6269
... ... @@ -260,7 +260,7 @@
260 260 static inline int iop3xx_aau_xor_slot_count(size_t len, int src_cnt,
261 261 int *slots_per_op)
262 262 {
263   - const static int slot_count_table[] = { 0,
  263 + static const int slot_count_table[] = { 0,
264 264 1, 1, 1, 1, /* 01 - 04 */
265 265 2, 2, 2, 2, /* 05 - 08 */
266 266 4, 4, 4, 4, /* 09 - 12 */
... ... @@ -369,7 +369,7 @@
369 369 /* translate the src_idx to a descriptor word index */
370 370 static inline int __desc_idx(int src_idx)
371 371 {
372   - const static int desc_idx_table[] = { 0, 0, 0, 0,
  372 + static const int desc_idx_table[] = { 0, 0, 0, 0,
373 373 0, 1, 2, 3,
374 374 5, 6, 7, 8,
375 375 9, 10, 11, 12,
include/keys/rxrpc-type.h
Diff comments   View file @ e9b6269
... ... @@ -21,5 +21,5 @@
21 21  
22 22 extern struct key *rxrpc_get_null_key(const char *);
23 23  
24   -#endif /* _KEYS_USER_TYPE_H */
  24 +#endif /* _KEYS_RXRPC_TYPE_H */
include/linux/dmaengine.h
Diff comments   View file @ e9b6269
... ... @@ -404,7 +404,7 @@
404 404 * @last_used: last cookie value handed out
405 405 *
406 406 * dma_async_is_complete() is used in dma_async_memcpy_complete()
407   - * the test logic is seperated for lightweight testing of multiple cookies
  407 + * the test logic is separated for lightweight testing of multiple cookies
408 408 */
409 409 static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie,
410 410 dma_cookie_t last_complete, dma_cookie_t last_used)
include/linux/jiffies.h
Diff comments   View file @ e9b6269
... ... @@ -36,7 +36,7 @@
36 36 #elif HZ >= 6144 && HZ < 12288
37 37 # define SHIFT_HZ 13
38 38 #else
39   -# error You lose.
  39 +# error Invalid value of HZ.
40 40 #endif
41 41  
42 42 /* LATCH is used in the interval timer and ftape setup. */
include/linux/mmzone.h
Diff comments   View file @ e9b6269
... ... @@ -699,7 +699,6 @@
699 699 extern struct pglist_data contig_page_data;
700 700 #define NODE_DATA(nid) (&contig_page_data)
701 701 #define NODE_MEM_MAP(nid) mem_map
702   -#define MAX_NODES_SHIFT 1
703 702  
704 703 #else /* CONFIG_NEED_MULTIPLE_NODES */
705 704  
... ... @@ -220,7 +220,7 @@
220 220 unsigned long flags;
221 221  
222 222 spin_lock_irqsave(&t->sighand->siglock, flags);
223   - clear_tsk_thread_flag(t,TIF_SIGPENDING);
  223 + clear_tsk_thread_flag(t, TIF_SIGPENDING);
224 224 flush_sigqueue(&t->pending);
225 225 flush_sigqueue(&t->signal->shared_pending);
226 226 spin_unlock_irqrestore(&t->sighand->siglock, flags);
... ... @@ -424,7 +424,7 @@
424 424 }
425 425 if (signr &&
426 426 ((info->si_code & __SI_MASK) == __SI_TIMER) &&
427   - info->si_sys_private){
  427 + info->si_sys_private) {
428 428 /*
429 429 * Release the siglock to ensure proper locking order
430 430 * of timer locks outside of siglocks. Note, we leave
kernel/stop_machine.c
Diff comments   View file @ e9b6269
... ... @@ -134,8 +134,7 @@
134 134 preempt_enable_no_resched();
135 135 }
136 136  
137   -struct stop_machine_data
138   -{
  137 +struct stop_machine_data {
139 138 int (*fn)(void *);
140 139 void *data;
141 140 struct completion done;
... ... @@ -17,8 +17,8 @@
17 17 #include <linux/gfp.h>
18 18 #include <linux/init.h>
19 19 #include <linux/module.h>
20   -#include <linux/fs.h> // Needed by writeback.h
21   -#include <linux/writeback.h> // Prototypes pdflush_operation()
  20 +#include <linux/fs.h> /* Needed by writeback.h */
  21 +#include <linux/writeback.h> /* Prototypes pdflush_operation() */
22 22 #include <linux/kthread.h>
23 23 #include <linux/cpuset.h>
24 24 #include <linux/freezer.h>
... ... @@ -942,7 +942,6 @@
942 942 * @family: protocol family
943 943 * @priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc)
944 944 * @prot: struct proto associated with this new sock instance
945   - * @zero_it: if we should zero the newly allocated sock
946 945 */
947 946 struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
948 947 struct proto *prot)
samples/firmware_class/firmware_sample_driver.c
Diff comments   View file @ e9b6269
... ... @@ -73,6 +73,7 @@
73 73  
74 74 /* finish setting up the device */
75 75 }
  76 +
76 77 static void sample_probe_async_cont(const struct firmware *fw, void *context)
77 78 {
78 79 if (!fw) {
... ... @@ -920,7 +920,7 @@
920 920 u16 status;
921 921 u16 rdy;
922 922 int count;
923   - const static u16 codec_ready[3] = {
  923 + static const u16 codec_ready[3] = {
924 924 SIS_AC97_STATUS_CODEC_READY,
925 925 SIS_AC97_STATUS_CODEC2_READY,
926 926 SIS_AC97_STATUS_CODEC3_READY,
... ... @@ -984,7 +984,7 @@
984 984 static void sis_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
985 985 unsigned short val)
986 986 {
987   - const static u32 cmd[3] = {
  987 + static const u32 cmd[3] = {
988 988 SIS_AC97_CMD_CODEC_WRITE,
989 989 SIS_AC97_CMD_CODEC2_WRITE,
990 990 SIS_AC97_CMD_CODEC3_WRITE,
... ... @@ -995,7 +995,7 @@
995 995  
996 996 static unsigned short sis_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
997 997 {
998   - const static u32 cmd[3] = {
  998 + static const u32 cmd[3] = {
999 999 SIS_AC97_CMD_CODEC_READ,
1000 1000 SIS_AC97_CMD_CODEC2_READ,
1001 1001 SIS_AC97_CMD_CODEC3_READ,
... ... @@ -137,7 +137,7 @@
137 137 /*
138 138 * ALSA defs
139 139 */
140   -const static struct snd_pcm_hardware snd_ps3_pcm_hw = {
  140 +static const struct snd_pcm_hardware snd_ps3_pcm_hw = {
141 141 .info = (SNDRV_PCM_INFO_MMAP |
142 142 SNDRV_PCM_INFO_NONINTERLEAVED |
143 143 SNDRV_PCM_INFO_MMAP_VALID),