Le 17/02/2018 ? 22:19, Pavel Machek a ?crit?:
>
> Fix double ;;'s in code.
>
> Signed-off-by: Pavel Machek <pavel at ucw.cz>
A summary of the files modified on top of the patch would help
understand the impact.
A maybe there should be one patch by area, eg one for each arch specific
modif and one for drivers/ and one for block/ ?
Christophe
>
> diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
> index 9d27331..ec12fe1 100644
> --- a/arch/arc/kernel/setup.c
> +++ b/arch/arc/kernel/setup.c
> @@ -373,7 +373,7 @@ static void arc_chk_core_config(void)
> {
> struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()];
> int saved = 0, present = 0;
> - char *opt_nm = NULL;;
> + char *opt_nm = NULL;
>
> if (!cpu->extn.timer0)
> panic("Timer0 is not present!\n");
> diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c
> index 333daab..183391d 100644
> --- a/arch/arc/kernel/unwind.c
> +++ b/arch/arc/kernel/unwind.c
> @@ -366,7 +366,7 @@ static void init_unwind_hdr(struct unwind_table *table,
> return;
>
> ret_err:
> - panic("Attention !!! Dwarf FDE parsing errors\n");;
> + panic("Attention !!! Dwarf FDE parsing errors\n");
> }
>
> #ifdef CONFIG_MODULES
> diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
> index 629f8e9..cf2701c 100644
> --- a/arch/arm/kernel/time.c
> +++ b/arch/arm/kernel/time.c
> @@ -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_boot_clock = dummy_clock_access;;
> +static clock_access_fn __read_boot_clock = dummy_clock_access;
>
> void read_persistent_clock64(struct timespec64 *ts)
> {
> diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
> index 6618036..9ae31f7 100644
> --- a/arch/arm64/kernel/ptrace.c
> +++ b/arch/arm64/kernel/ptrace.c
> @@ -1419,7 +1419,7 @@ static int compat_ptrace_hbp_get(unsigned int note_type,
> u64 addr = 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) {
> err = ptrace_hbp_get_addr(note_type, tsk, idx, &addr);
> diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
> index f0f5cd4..f9818d7 100644
> --- a/arch/powerpc/kvm/book3s_xive.c
> +++ b/arch/powerpc/kvm/book3s_xive.c
> @@ -188,7 +188,7 @@ static int xive_provision_queue(struct kvm_vcpu *vcpu, u8 prio)
> if (!qpage) {
> pr_err("Failed to allocate queue %d for VCPU %d\n",
> prio, xc->server_num);
> - return -ENOMEM;;
> + return -ENOMEM;
> }
> memset(qpage, 0, 1 << xive->q_order);
>
> diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
> index 496e476..a6c92c7 100644
> --- a/arch/powerpc/platforms/powernv/pci-ioda.c
> +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
> @@ -1854,7 +1854,7 @@ static int pnv_pci_ioda_dma_set_mask(struct pci_dev *pdev, u64 dma_mask)
> s64 rc;
>
> if (WARN_ON(!pdn || pdn->pe_number == IODA_INVALID_PE))
> - return -ENODEV;;
> + return -ENODEV;
>
> pe = &phb->ioda.pe_array[pdn->pe_number];
> if (pe->tce_bypass_enabled) {
> diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
> index 353e20c..886a911 100644
> --- a/arch/x86/boot/compressed/eboot.c
> +++ b/arch/x86/boot/compressed/eboot.c
> @@ -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;
> efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;
> unsigned long nr_ugas;
> - u32 *handles = (u32 *)uga_handle;;
> + u32 *handles = (u32 *)uga_handle;
> efi_status_t status = EFI_INVALID_PARAMETER;
> int i;
>
> @@ -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;
> efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;
> unsigned long nr_ugas;
> - u64 *handles = (u64 *)uga_handle;;
> + u64 *handles = (u64 *)uga_handle;
> efi_status_t status = EFI_INVALID_PARAMETER;
> int i;
>
> diff --git a/block/sed-opal.c b/block/sed-opal.c
> index 9ed51d0c..e4929ee 100644
> --- a/block/sed-opal.c
> +++ b/block/sed-opal.c
> @@ -490,7 +490,7 @@ static int opal_discovery0_end(struct opal_dev *dev)
>
> if (!found_com_id) {
> pr_debug("Could not find OPAL comid for device. Returning early\n");
> - return -EOPNOTSUPP;;
> + return -EOPNOTSUPP;
> }
>
> dev->comid = comid;
> diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
> index a04808a..65e18c8 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)
> } else if (of_property_read_u32(node, "clock-frequency",
> &gic_frequency)) {
> pr_err("GIC frequency not specified.\n");
> - return -EINVAL;;
> + return -EINVAL;
> }
> gic_timer_irq = irq_of_parse_and_map(node, 0);
> if (!gic_timer_irq) {
> pr_err("GIC timer IRQ not specified.\n");
> - return -EINVAL;;
> + return -EINVAL;
> }
>
> ret = __gic_clocksource_init();
> diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
> index 2a3fe83..3b56ea3 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)
> timer_base = of_io_request_and_map(node, 0, of_node_full_name(node));
> if (IS_ERR(timer_base)) {
> 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);
> 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 61e8c3e..33d91e4 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(
> uint32_t retries_ch_eq;
> enum dc_lane_count lane_count = lt_settings->link_settings.lane_count;
> 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);
>
> diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> index 4c3223a..adb6e7b 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)
> if(hwmgr->smumgr_funcs->start_smu(pp_handle->hwmgr)) {
> pr_err("smc start failed\n");
> hwmgr->smumgr_funcs->smu_fini(pp_handle->hwmgr);
> - return -EINVAL;;
> + return -EINVAL;
> }
> if (ret == PP_DPM_DISABLED)
> 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 3e9bba4..6d8e3a9 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)
> } else {
> dev_info(&pdev->dev,
> "no iommu, fallback to phys contig buffers for scanout\n");
> - aspace = NULL;;
> + aspace = NULL;
> }
>
> 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 2c18996..0d95888 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
> {
> struct drm_sched_job *s_job;
> struct drm_sched_entity *entity, *tmp;
> - int i;;
> + int i;
>
> spin_lock(&sched->job_list_lock);
> 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 35a408d..99bc9bd 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
> * for example, an "address" value of 0x12345f000 will
> * flush from 0x123440000 to 0x12347ffff (256KiB). */
> 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;
> } else {
> diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
> index b2eae33..f978edd 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,
>
> bio_copy_data(behind_bio, bio);
> skip_copy:
> - r1_bio->behind_master_bio = behind_bio;;
> + r1_bio->behind_master_bio = behind_bio;
> set_bit(R1BIO_BehindIO, &r1_bio->state);
>
> return;
> diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c
> index 53f7275..cfb42f5 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,
> if (i == 1) {
> domain->supply = devm_regulator_get(dev, "pu");
> if (IS_ERR(domain->supply))
> - return PTR_ERR(domain->supply);;
> + return PTR_ERR(domain->supply);
>
> ret = imx_pgc_get_clocks(dev, domain);
> if (ret)
>
