diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-25 19:27:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-25 19:27:51 -0500 |
commit | 297ea1b7f717db660fa6eb543dc0af41f7bf8d57 (patch) | |
tree | 057e3f108390c113516782d9de85cc537f8a0872 /drivers | |
parent | c89be5242607d8aa08a6fa45a887c68b2d4a2a2c (diff) | |
parent | ed7158bae41044ff696e9aafd5ada46d391a5a2e (diff) |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull cleanup patchlet from Thomas Gleixner:
"A single commit removing a bunch of bogus double semicolons all over
the tree"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
treewide/trivial: Remove ';;$' typo noise
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clocksource/mips-gic-timer.c | 4 | ||||
-rw-r--r-- | drivers/clocksource/timer-sun5i.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/scheduler/gpu_scheduler.c | 2 | ||||
-rw-r--r-- | drivers/iommu/intel-svm.c | 2 | ||||
-rw-r--r-- | drivers/md/raid1.c | 2 | ||||
-rw-r--r-- | drivers/soc/imx/gpc.c | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c index a04808a21d4e..65e18c86d9b9 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c | |||
@@ -205,12 +205,12 @@ static int __init gic_clocksource_of_init(struct device_node *node) | |||
205 | } else if (of_property_read_u32(node, "clock-frequency", | 205 | } else if (of_property_read_u32(node, "clock-frequency", |
206 | &gic_frequency)) { | 206 | &gic_frequency)) { |
207 | pr_err("GIC frequency not specified.\n"); | 207 | pr_err("GIC frequency not specified.\n"); |
208 | return -EINVAL;; | 208 | return -EINVAL; |
209 | } | 209 | } |
210 | gic_timer_irq = irq_of_parse_and_map(node, 0); | 210 | gic_timer_irq = irq_of_parse_and_map(node, 0); |
211 | if (!gic_timer_irq) { | 211 | if (!gic_timer_irq) { |
212 | pr_err("GIC timer IRQ not specified.\n"); | 212 | pr_err("GIC timer IRQ not specified.\n"); |
213 | return -EINVAL;; | 213 | return -EINVAL; |
214 | } | 214 | } |
215 | 215 | ||
216 | ret = __gic_clocksource_init(); | 216 | ret = __gic_clocksource_init(); |
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c index 2a3fe83ec337..3b56ea3f52af 100644 --- a/drivers/clocksource/timer-sun5i.c +++ b/drivers/clocksource/timer-sun5i.c | |||
@@ -334,7 +334,7 @@ static int __init sun5i_timer_init(struct device_node *node) | |||
334 | timer_base = of_io_request_and_map(node, 0, of_node_full_name(node)); | 334 | timer_base = of_io_request_and_map(node, 0, of_node_full_name(node)); |
335 | if (IS_ERR(timer_base)) { | 335 | if (IS_ERR(timer_base)) { |
336 | pr_err("Can't map registers\n"); | 336 | pr_err("Can't map registers\n"); |
337 | return PTR_ERR(timer_base);; | 337 | return PTR_ERR(timer_base); |
338 | } | 338 | } |
339 | 339 | ||
340 | irq = irq_of_parse_and_map(node, 0); | 340 | irq = irq_of_parse_and_map(node, 0); |
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index 61e8c3e02d16..33d91e4474ea 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | |||
@@ -718,7 +718,7 @@ static enum link_training_result perform_channel_equalization_sequence( | |||
718 | uint32_t retries_ch_eq; | 718 | uint32_t retries_ch_eq; |
719 | enum dc_lane_count lane_count = lt_settings->link_settings.lane_count; | 719 | enum dc_lane_count lane_count = lt_settings->link_settings.lane_count; |
720 | union lane_align_status_updated dpcd_lane_status_updated = {{0}}; | 720 | union lane_align_status_updated dpcd_lane_status_updated = {{0}}; |
721 | union lane_status dpcd_lane_status[LANE_COUNT_DP_MAX] = {{{0}}};; | 721 | union lane_status dpcd_lane_status[LANE_COUNT_DP_MAX] = {{{0}}}; |
722 | 722 | ||
723 | hw_tr_pattern = get_supported_tp(link); | 723 | hw_tr_pattern = get_supported_tp(link); |
724 | 724 | ||
diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index 4c3223a4d62b..adb6e7b9280c 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c | |||
@@ -162,7 +162,7 @@ static int pp_hw_init(void *handle) | |||
162 | if(hwmgr->smumgr_funcs->start_smu(pp_handle->hwmgr)) { | 162 | if(hwmgr->smumgr_funcs->start_smu(pp_handle->hwmgr)) { |
163 | pr_err("smc start failed\n"); | 163 | pr_err("smc start failed\n"); |
164 | hwmgr->smumgr_funcs->smu_fini(pp_handle->hwmgr); | 164 | hwmgr->smumgr_funcs->smu_fini(pp_handle->hwmgr); |
165 | return -EINVAL;; | 165 | return -EINVAL; |
166 | } | 166 | } |
167 | if (ret == PP_DPM_DISABLED) | 167 | if (ret == PP_DPM_DISABLED) |
168 | goto exit; | 168 | goto exit; |
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c index 3e9bba4d6624..6d8e3a9a6fc0 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | |||
@@ -680,7 +680,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) | |||
680 | } else { | 680 | } else { |
681 | dev_info(&pdev->dev, | 681 | dev_info(&pdev->dev, |
682 | "no iommu, fallback to phys contig buffers for scanout\n"); | 682 | "no iommu, fallback to phys contig buffers for scanout\n"); |
683 | aspace = NULL;; | 683 | aspace = NULL; |
684 | } | 684 | } |
685 | 685 | ||
686 | pm_runtime_put_sync(&pdev->dev); | 686 | pm_runtime_put_sync(&pdev->dev); |
diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c index 2c18996d59c5..0d95888ccc3e 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c | |||
@@ -461,7 +461,7 @@ void drm_sched_hw_job_reset(struct drm_gpu_scheduler *sched, struct drm_sched_jo | |||
461 | { | 461 | { |
462 | struct drm_sched_job *s_job; | 462 | struct drm_sched_job *s_job; |
463 | struct drm_sched_entity *entity, *tmp; | 463 | struct drm_sched_entity *entity, *tmp; |
464 | int i;; | 464 | int i; |
465 | 465 | ||
466 | spin_lock(&sched->job_list_lock); | 466 | spin_lock(&sched->job_list_lock); |
467 | list_for_each_entry_reverse(s_job, &sched->ring_mirror_list, node) { | 467 | list_for_each_entry_reverse(s_job, &sched->ring_mirror_list, node) { |
diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c index 35a408d0ae4f..99bc9bd64b9e 100644 --- a/drivers/iommu/intel-svm.c +++ b/drivers/iommu/intel-svm.c | |||
@@ -205,7 +205,7 @@ static void intel_flush_svm_range_dev (struct intel_svm *svm, struct intel_svm_d | |||
205 | * for example, an "address" value of 0x12345f000 will | 205 | * for example, an "address" value of 0x12345f000 will |
206 | * flush from 0x123440000 to 0x12347ffff (256KiB). */ | 206 | * flush from 0x123440000 to 0x12347ffff (256KiB). */ |
207 | unsigned long last = address + ((unsigned long)(pages - 1) << VTD_PAGE_SHIFT); | 207 | unsigned long last = address + ((unsigned long)(pages - 1) << VTD_PAGE_SHIFT); |
208 | unsigned long mask = __rounddown_pow_of_two(address ^ last);; | 208 | unsigned long mask = __rounddown_pow_of_two(address ^ last); |
209 | 209 | ||
210 | desc.high = QI_DEV_EIOTLB_ADDR((address & ~mask) | (mask - 1)) | QI_DEV_EIOTLB_SIZE; | 210 | desc.high = QI_DEV_EIOTLB_ADDR((address & ~mask) | (mask - 1)) | QI_DEV_EIOTLB_SIZE; |
211 | } else { | 211 | } else { |
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index b2eae332e1a2..f978eddc7a21 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
@@ -1108,7 +1108,7 @@ static void alloc_behind_master_bio(struct r1bio *r1_bio, | |||
1108 | 1108 | ||
1109 | bio_copy_data(behind_bio, bio); | 1109 | bio_copy_data(behind_bio, bio); |
1110 | skip_copy: | 1110 | skip_copy: |
1111 | r1_bio->behind_master_bio = behind_bio;; | 1111 | r1_bio->behind_master_bio = behind_bio; |
1112 | set_bit(R1BIO_BehindIO, &r1_bio->state); | 1112 | set_bit(R1BIO_BehindIO, &r1_bio->state); |
1113 | 1113 | ||
1114 | return; | 1114 | return; |
diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c index 53f7275d6cbd..cfb42f5eccb2 100644 --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c | |||
@@ -348,7 +348,7 @@ static int imx_gpc_old_dt_init(struct device *dev, struct regmap *regmap, | |||
348 | if (i == 1) { | 348 | if (i == 1) { |
349 | domain->supply = devm_regulator_get(dev, "pu"); | 349 | domain->supply = devm_regulator_get(dev, "pu"); |
350 | if (IS_ERR(domain->supply)) | 350 | if (IS_ERR(domain->supply)) |
351 | return PTR_ERR(domain->supply);; | 351 | return PTR_ERR(domain->supply); |
352 | 352 | ||
353 | ret = imx_pgc_get_clocks(dev, domain); | 353 | ret = imx_pgc_get_clocks(dev, domain); |
354 | if (ret) | 354 | if (ret) |