diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2020-11-07 12:50:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-11-07 13:20:17 +0100 |
| commit | 666fab4a3ea143315a9c059fad9f3a0f1365d54b (patch) | |
| tree | e9e4be3b0eeac79346d52a86183326617d0c9999 /drivers/pwm/pwm-bcm2835.c | |
| parent | Merge branch 'linus' into perf/kprobes (diff) | |
| parent | Merge tag 'ceph-for-5.10-rc3' of git://github.com/ceph/ceph-client (diff) | |
| download | wireguard-linux-666fab4a3ea143315a9c059fad9f3a0f1365d54b.tar.xz wireguard-linux-666fab4a3ea143315a9c059fad9f3a0f1365d54b.zip | |
Merge branch 'linus' into perf/kprobes
Conflicts:
include/asm-generic/atomic-instrumented.h
kernel/kprobes.c
Use the upstream atomic-instrumented.h checksum, and pick
the kprobes version of kernel/kprobes.c, which effectively
reverts this upstream workaround:
645f224e7ba2: ("kprobes: Tell lockdep about kprobe nesting")
Since the new code *should* be fine without nesting.
Knock on wood ...
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/pwm/pwm-bcm2835.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c index d78f86f8e462..6841dcfe27fc 100644 --- a/drivers/pwm/pwm-bcm2835.c +++ b/drivers/pwm/pwm-bcm2835.c @@ -152,13 +152,9 @@ static int bcm2835_pwm_probe(struct platform_device *pdev) return PTR_ERR(pc->base); pc->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(pc->clk)) { - ret = PTR_ERR(pc->clk); - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "clock not found: %d\n", ret); - - return ret; - } + if (IS_ERR(pc->clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk), + "clock not found\n"); ret = clk_prepare_enable(pc->clk); if (ret) |