Commit 297ea1b7 authored by Linus Torvalds's avatar Linus Torvalds

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
parents c89be524 ed7158ba
...@@ -373,7 +373,7 @@ static void arc_chk_core_config(void) ...@@ -373,7 +373,7 @@ static void arc_chk_core_config(void)
{ {
struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()]; struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()];
int saved = 0, present = 0; int saved = 0, present = 0;
char *opt_nm = NULL;; char *opt_nm = NULL;
if (!cpu->extn.timer0) if (!cpu->extn.timer0)
panic("Timer0 is not present!\n"); panic("Timer0 is not present!\n");
......
...@@ -366,7 +366,7 @@ static void init_unwind_hdr(struct unwind_table *table, ...@@ -366,7 +366,7 @@ static void init_unwind_hdr(struct unwind_table *table,
return; return;
ret_err: ret_err:
panic("Attention !!! Dwarf FDE parsing errors\n");; panic("Attention !!! Dwarf FDE parsing errors\n");
} }
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
......
...@@ -83,7 +83,7 @@ static void dummy_clock_access(struct timespec64 *ts) ...@@ -83,7 +83,7 @@ static void dummy_clock_access(struct timespec64 *ts)
} }
static clock_access_fn __read_persistent_clock = dummy_clock_access; static clock_access_fn __read_persistent_clock = dummy_clock_access;
static clock_access_fn __read_boot_clock = dummy_clock_access;; static clock_access_fn __read_boot_clock = dummy_clock_access;
void read_persistent_clock64(struct timespec64 *ts) void read_persistent_clock64(struct timespec64 *ts)
{ {
......
...@@ -1419,7 +1419,7 @@ static int compat_ptrace_hbp_get(unsigned int note_type, ...@@ -1419,7 +1419,7 @@ static int compat_ptrace_hbp_get(unsigned int note_type,
u64 addr = 0; u64 addr = 0;
u32 ctrl = 0; u32 ctrl = 0;
int err, idx = compat_ptrace_hbp_num_to_idx(num);; int err, idx = compat_ptrace_hbp_num_to_idx(num);
if (num & 1) { if (num & 1) {
err = ptrace_hbp_get_addr(note_type, tsk, idx, &addr); err = ptrace_hbp_get_addr(note_type, tsk, idx, &addr);
......
...@@ -188,7 +188,7 @@ static int xive_provision_queue(struct kvm_vcpu *vcpu, u8 prio) ...@@ -188,7 +188,7 @@ static int xive_provision_queue(struct kvm_vcpu *vcpu, u8 prio)
if (!qpage) { if (!qpage) {
pr_err("Failed to allocate queue %d for VCPU %d\n", pr_err("Failed to allocate queue %d for VCPU %d\n",
prio, xc->server_num); prio, xc->server_num);
return -ENOMEM;; return -ENOMEM;
} }
memset(qpage, 0, 1 << xive->q_order); memset(qpage, 0, 1 << xive->q_order);
......
...@@ -1854,7 +1854,7 @@ static int pnv_pci_ioda_dma_set_mask(struct pci_dev *pdev, u64 dma_mask) ...@@ -1854,7 +1854,7 @@ static int pnv_pci_ioda_dma_set_mask(struct pci_dev *pdev, u64 dma_mask)
s64 rc; s64 rc;
if (WARN_ON(!pdn || pdn->pe_number == IODA_INVALID_PE)) if (WARN_ON(!pdn || pdn->pe_number == IODA_INVALID_PE))
return -ENODEV;; return -ENODEV;
pe = &phb->ioda.pe_array[pdn->pe_number]; pe = &phb->ioda.pe_array[pdn->pe_number];
if (pe->tce_bypass_enabled) { if (pe->tce_bypass_enabled) {
......
...@@ -439,7 +439,7 @@ setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height) ...@@ -439,7 +439,7 @@ setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height)
struct efi_uga_draw_protocol *uga = NULL, *first_uga; struct efi_uga_draw_protocol *uga = NULL, *first_uga;
efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID; efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;
unsigned long nr_ugas; unsigned long nr_ugas;
u32 *handles = (u32 *)uga_handle;; u32 *handles = (u32 *)uga_handle;
efi_status_t status = EFI_INVALID_PARAMETER; efi_status_t status = EFI_INVALID_PARAMETER;
int i; int i;
...@@ -484,7 +484,7 @@ setup_uga64(void **uga_handle, unsigned long size, u32 *width, u32 *height) ...@@ -484,7 +484,7 @@ setup_uga64(void **uga_handle, unsigned long size, u32 *width, u32 *height)
struct efi_uga_draw_protocol *uga = NULL, *first_uga; struct efi_uga_draw_protocol *uga = NULL, *first_uga;
efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID; efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;
unsigned long nr_ugas; unsigned long nr_ugas;
u64 *handles = (u64 *)uga_handle;; u64 *handles = (u64 *)uga_handle;
efi_status_t status = EFI_INVALID_PARAMETER; efi_status_t status = EFI_INVALID_PARAMETER;
int i; int i;
......
...@@ -490,7 +490,7 @@ static int opal_discovery0_end(struct opal_dev *dev) ...@@ -490,7 +490,7 @@ static int opal_discovery0_end(struct opal_dev *dev)
if (!found_com_id) { if (!found_com_id) {
pr_debug("Could not find OPAL comid for device. Returning early\n"); pr_debug("Could not find OPAL comid for device. Returning early\n");
return -EOPNOTSUPP;; return -EOPNOTSUPP;
} }
dev->comid = comid; dev->comid = comid;
......
...@@ -205,12 +205,12 @@ static int __init gic_clocksource_of_init(struct device_node *node) ...@@ -205,12 +205,12 @@ static int __init gic_clocksource_of_init(struct device_node *node)
} else if (of_property_read_u32(node, "clock-frequency", } else if (of_property_read_u32(node, "clock-frequency",
&gic_frequency)) { &gic_frequency)) {
pr_err("GIC frequency not specified.\n"); pr_err("GIC frequency not specified.\n");
return -EINVAL;; return -EINVAL;
} }
gic_timer_irq = irq_of_parse_and_map(node, 0); gic_timer_irq = irq_of_parse_and_map(node, 0);
if (!gic_timer_irq) { if (!gic_timer_irq) {
pr_err("GIC timer IRQ not specified.\n"); pr_err("GIC timer IRQ not specified.\n");
return -EINVAL;; return -EINVAL;
} }
ret = __gic_clocksource_init(); ret = __gic_clocksource_init();
......
...@@ -334,7 +334,7 @@ static int __init sun5i_timer_init(struct device_node *node) ...@@ -334,7 +334,7 @@ static int __init sun5i_timer_init(struct device_node *node)
timer_base = of_io_request_and_map(node, 0, of_node_full_name(node)); timer_base = of_io_request_and_map(node, 0, of_node_full_name(node));
if (IS_ERR(timer_base)) { if (IS_ERR(timer_base)) {
pr_err("Can't map registers\n"); pr_err("Can't map registers\n");
return PTR_ERR(timer_base);; return PTR_ERR(timer_base);
} }
irq = irq_of_parse_and_map(node, 0); irq = irq_of_parse_and_map(node, 0);
......
...@@ -718,7 +718,7 @@ static enum link_training_result perform_channel_equalization_sequence( ...@@ -718,7 +718,7 @@ static enum link_training_result perform_channel_equalization_sequence(
uint32_t retries_ch_eq; uint32_t retries_ch_eq;
enum dc_lane_count lane_count = lt_settings->link_settings.lane_count; enum dc_lane_count lane_count = lt_settings->link_settings.lane_count;
union lane_align_status_updated dpcd_lane_status_updated = {{0}}; union lane_align_status_updated dpcd_lane_status_updated = {{0}};
union lane_status dpcd_lane_status[LANE_COUNT_DP_MAX] = {{{0}}};; union lane_status dpcd_lane_status[LANE_COUNT_DP_MAX] = {{{0}}};
hw_tr_pattern = get_supported_tp(link); hw_tr_pattern = get_supported_tp(link);
......
...@@ -162,7 +162,7 @@ static int pp_hw_init(void *handle) ...@@ -162,7 +162,7 @@ static int pp_hw_init(void *handle)
if(hwmgr->smumgr_funcs->start_smu(pp_handle->hwmgr)) { if(hwmgr->smumgr_funcs->start_smu(pp_handle->hwmgr)) {
pr_err("smc start failed\n"); pr_err("smc start failed\n");
hwmgr->smumgr_funcs->smu_fini(pp_handle->hwmgr); hwmgr->smumgr_funcs->smu_fini(pp_handle->hwmgr);
return -EINVAL;; return -EINVAL;
} }
if (ret == PP_DPM_DISABLED) if (ret == PP_DPM_DISABLED)
goto exit; goto exit;
......
...@@ -680,7 +680,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) ...@@ -680,7 +680,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
} else { } else {
dev_info(&pdev->dev, dev_info(&pdev->dev,
"no iommu, fallback to phys contig buffers for scanout\n"); "no iommu, fallback to phys contig buffers for scanout\n");
aspace = NULL;; aspace = NULL;
} }
pm_runtime_put_sync(&pdev->dev); pm_runtime_put_sync(&pdev->dev);
......
...@@ -461,7 +461,7 @@ void drm_sched_hw_job_reset(struct drm_gpu_scheduler *sched, struct drm_sched_jo ...@@ -461,7 +461,7 @@ void drm_sched_hw_job_reset(struct drm_gpu_scheduler *sched, struct drm_sched_jo
{ {
struct drm_sched_job *s_job; struct drm_sched_job *s_job;
struct drm_sched_entity *entity, *tmp; struct drm_sched_entity *entity, *tmp;
int i;; int i;
spin_lock(&sched->job_list_lock); spin_lock(&sched->job_list_lock);
list_for_each_entry_reverse(s_job, &sched->ring_mirror_list, node) { list_for_each_entry_reverse(s_job, &sched->ring_mirror_list, node) {
......
...@@ -205,7 +205,7 @@ static void intel_flush_svm_range_dev (struct intel_svm *svm, struct intel_svm_d ...@@ -205,7 +205,7 @@ static void intel_flush_svm_range_dev (struct intel_svm *svm, struct intel_svm_d
* for example, an "address" value of 0x12345f000 will * for example, an "address" value of 0x12345f000 will
* flush from 0x123440000 to 0x12347ffff (256KiB). */ * flush from 0x123440000 to 0x12347ffff (256KiB). */
unsigned long last = address + ((unsigned long)(pages - 1) << VTD_PAGE_SHIFT); unsigned long last = address + ((unsigned long)(pages - 1) << VTD_PAGE_SHIFT);
unsigned long mask = __rounddown_pow_of_two(address ^ last);; unsigned long mask = __rounddown_pow_of_two(address ^ last);
desc.high = QI_DEV_EIOTLB_ADDR((address & ~mask) | (mask - 1)) | QI_DEV_EIOTLB_SIZE; desc.high = QI_DEV_EIOTLB_ADDR((address & ~mask) | (mask - 1)) | QI_DEV_EIOTLB_SIZE;
} else { } else {
......
...@@ -1108,7 +1108,7 @@ static void alloc_behind_master_bio(struct r1bio *r1_bio, ...@@ -1108,7 +1108,7 @@ static void alloc_behind_master_bio(struct r1bio *r1_bio,
bio_copy_data(behind_bio, bio); bio_copy_data(behind_bio, bio);
skip_copy: skip_copy:
r1_bio->behind_master_bio = behind_bio;; r1_bio->behind_master_bio = behind_bio;
set_bit(R1BIO_BehindIO, &r1_bio->state); set_bit(R1BIO_BehindIO, &r1_bio->state);
return; return;
......
...@@ -348,7 +348,7 @@ static int imx_gpc_old_dt_init(struct device *dev, struct regmap *regmap, ...@@ -348,7 +348,7 @@ static int imx_gpc_old_dt_init(struct device *dev, struct regmap *regmap,
if (i == 1) { if (i == 1) {
domain->supply = devm_regulator_get(dev, "pu"); domain->supply = devm_regulator_get(dev, "pu");
if (IS_ERR(domain->supply)) if (IS_ERR(domain->supply))
return PTR_ERR(domain->supply);; return PTR_ERR(domain->supply);
ret = imx_pgc_get_clocks(dev, domain); ret = imx_pgc_get_clocks(dev, domain);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment