diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-07 22:25:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-07 22:25:37 -0500 |
commit | b5dd0c658c31b469ccff1b637e5124851e7a4a1c (patch) | |
tree | dc0b31a5aa62bb4e1fa653a4f176c2faae51f9e0 /lib/test_firmware.c | |
parent | 610cd4eadec4f97acd25d3108b0e50d1362b3319 (diff) | |
parent | fe0436e10c8845aed24cad3a1c719efcd6e583eb (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton:
- some of the rest of MM
- various misc things
- dynamic-debug updates
- checkpatch
- some epoll speedups
- autofs
- rapidio
- lib/, lib/lzo/ updates
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (83 commits)
samples/mic/mpssd/mpssd.h: remove duplicate header
kernel/fork.c: remove duplicated include
include/linux/relay.h: fix percpu annotation in struct rchan
arch/nios2/mm/fault.c: remove duplicate include
unicore32: stop printing the virtual memory layout
MAINTAINERS: fix GTA02 entry and mark as orphan
mm: create the new vm_fault_t type
arm, s390, unicore32: remove oneliner wrappers for memblock_alloc()
arch: simplify several early memory allocations
openrisc: simplify pte_alloc_one_kernel()
sh: prefer memblock APIs returning virtual address
microblaze: prefer memblock API returning virtual address
powerpc: prefer memblock APIs returning virtual address
lib/lzo: separate lzo-rle from lzo
lib/lzo: implement run-length encoding
lib/lzo: fast 8-byte copy on arm64
lib/lzo: 64-bit CTZ on arm64
lib/lzo: tidy-up ifdefs
ipc/sem.c: replace kvmalloc/memset with kvzalloc and use struct_size
ipc: annotate implicit fall through
...
Diffstat (limited to 'lib/test_firmware.c')
-rw-r--r-- | lib/test_firmware.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/test_firmware.c b/lib/test_firmware.c index 7cab9a9869ac..7222093ee00b 100644 --- a/lib/test_firmware.c +++ b/lib/test_firmware.c | |||
@@ -631,11 +631,6 @@ static ssize_t trigger_batched_requests_store(struct device *dev, | |||
631 | 631 | ||
632 | for (i = 0; i < test_fw_config->num_requests; i++) { | 632 | for (i = 0; i < test_fw_config->num_requests; i++) { |
633 | req = &test_fw_config->reqs[i]; | 633 | req = &test_fw_config->reqs[i]; |
634 | if (!req) { | ||
635 | WARN_ON(1); | ||
636 | rc = -ENOMEM; | ||
637 | goto out_bail; | ||
638 | } | ||
639 | req->fw = NULL; | 634 | req->fw = NULL; |
640 | req->idx = i; | 635 | req->idx = i; |
641 | req->name = test_fw_config->name; | 636 | req->name = test_fw_config->name; |
@@ -737,10 +732,6 @@ ssize_t trigger_batched_requests_async_store(struct device *dev, | |||
737 | 732 | ||
738 | for (i = 0; i < test_fw_config->num_requests; i++) { | 733 | for (i = 0; i < test_fw_config->num_requests; i++) { |
739 | req = &test_fw_config->reqs[i]; | 734 | req = &test_fw_config->reqs[i]; |
740 | if (!req) { | ||
741 | WARN_ON(1); | ||
742 | goto out_bail; | ||
743 | } | ||
744 | req->name = test_fw_config->name; | 735 | req->name = test_fw_config->name; |
745 | req->fw = NULL; | 736 | req->fw = NULL; |
746 | req->idx = i; | 737 | req->idx = i; |