[merged] fix-double-s-in-code.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: treewide: fix double ;;s in code
has been removed from the -mm tree.  Its filename was
     fix-double-s-in-code.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Pavel Machek <pavel@xxxxxx>
Subject: treewide: fix double ;;s in code

Fix double ;;'s in code.

Link: http://lkml.kernel.org/r/20180217211955.GE9640@amd
Signed-off-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 arch/arm/kernel/time.c                           |    2 +-
 arch/arm64/kernel/ptrace.c                       |    2 +-
 arch/powerpc/kvm/book3s_xive.c                   |    2 +-
 arch/powerpc/platforms/powernv/pci-ioda.c        |    2 +-
 arch/x86/boot/compressed/eboot.c                 |    4 ++--
 block/sed-opal.c                                 |    2 +-
 drivers/clocksource/mips-gic-timer.c             |    4 ++--
 drivers/clocksource/timer-sun5i.c                |    2 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c |    2 +-
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c    |    2 +-
 drivers/gpu/drm/scheduler/gpu_scheduler.c        |    2 +-
 drivers/iommu/intel-svm.c                        |    2 +-
 drivers/soc/imx/gpc.c                            |    2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff -puN arch/arm64/kernel/ptrace.c~fix-double-s-in-code arch/arm64/kernel/ptrace.c
--- a/arch/arm64/kernel/ptrace.c~fix-double-s-in-code
+++ a/arch/arm64/kernel/ptrace.c
@@ -1419,7 +1419,7 @@ static int compat_ptrace_hbp_get(unsigne
 	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 -puN arch/arm/kernel/time.c~fix-double-s-in-code arch/arm/kernel/time.c
--- a/arch/arm/kernel/time.c~fix-double-s-in-code
+++ a/arch/arm/kernel/time.c
@@ -83,7 +83,7 @@ static void dummy_clock_access(struct ti
 }
 
 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 -puN arch/powerpc/kvm/book3s_xive.c~fix-double-s-in-code arch/powerpc/kvm/book3s_xive.c
--- a/arch/powerpc/kvm/book3s_xive.c~fix-double-s-in-code
+++ a/arch/powerpc/kvm/book3s_xive.c
@@ -188,7 +188,7 @@ static int xive_provision_queue(struct k
 	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 -puN arch/powerpc/platforms/powernv/pci-ioda.c~fix-double-s-in-code arch/powerpc/platforms/powernv/pci-ioda.c
--- a/arch/powerpc/platforms/powernv/pci-ioda.c~fix-double-s-in-code
+++ a/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1854,7 +1854,7 @@ static int pnv_pci_ioda_dma_set_mask(str
 	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 -puN arch/x86/boot/compressed/eboot.c~fix-double-s-in-code arch/x86/boot/compressed/eboot.c
--- a/arch/x86/boot/compressed/eboot.c~fix-double-s-in-code
+++ a/arch/x86/boot/compressed/eboot.c
@@ -439,7 +439,7 @@ setup_uga32(void **uga_handle, unsigned
 	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
 	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 -puN block/sed-opal.c~fix-double-s-in-code block/sed-opal.c
--- a/block/sed-opal.c~fix-double-s-in-code
+++ a/block/sed-opal.c
@@ -490,7 +490,7 @@ static int opal_discovery0_end(struct op
 
 	if (!found_com_id) {
 		pr_debug("Could not find OPAL comid for device. Returning early\n");
-		return -EOPNOTSUPP;;
+		return -EOPNOTSUPP;
 	}
 
 	dev->comid = comid;
diff -puN drivers/clocksource/mips-gic-timer.c~fix-double-s-in-code drivers/clocksource/mips-gic-timer.c
--- a/drivers/clocksource/mips-gic-timer.c~fix-double-s-in-code
+++ a/drivers/clocksource/mips-gic-timer.c
@@ -205,12 +205,12 @@ static int __init gic_clocksource_of_ini
 	} 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 -puN drivers/clocksource/timer-sun5i.c~fix-double-s-in-code drivers/clocksource/timer-sun5i.c
--- a/drivers/clocksource/timer-sun5i.c~fix-double-s-in-code
+++ a/drivers/clocksource/timer-sun5i.c
@@ -334,7 +334,7 @@ static int __init sun5i_timer_init(struc
 	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 -puN drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c~fix-double-s-in-code drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c~fix-double-s-in-code
+++ a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -718,7 +718,7 @@ static enum link_training_result perform
 	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 -puN drivers/gpu/drm/amd/powerplay/amd_powerplay.c~fix-double-s-in-code drivers/gpu/drm/amd/powerplay/amd_powerplay.c
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c~fix-double-s-in-code
+++ a/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 -puN drivers/gpu/drm/scheduler/gpu_scheduler.c~fix-double-s-in-code drivers/gpu/drm/scheduler/gpu_scheduler.c
--- a/drivers/gpu/drm/scheduler/gpu_scheduler.c~fix-double-s-in-code
+++ a/drivers/gpu/drm/scheduler/gpu_scheduler.c
@@ -461,7 +461,7 @@ void drm_sched_hw_job_reset(struct drm_g
 {
 	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 -puN drivers/iommu/intel-svm.c~fix-double-s-in-code drivers/iommu/intel-svm.c
--- a/drivers/iommu/intel-svm.c~fix-double-s-in-code
+++ a/drivers/iommu/intel-svm.c
@@ -205,7 +205,7 @@ static void intel_flush_svm_range_dev (s
 			 * 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 -puN drivers/soc/imx/gpc.c~fix-double-s-in-code drivers/soc/imx/gpc.c
--- a/drivers/soc/imx/gpc.c~fix-double-s-in-code
+++ a/drivers/soc/imx/gpc.c
@@ -350,7 +350,7 @@ static int imx_gpc_old_dt_init(struct de
 		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)
_

Patches currently in -mm which might be from pavel@xxxxxx are


--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux