From e4c3d257e314076401a448317fee63a7a43dd363 Mon Sep 17 00:00:00 2001 From: UtsavisGreat Date: Sat, 18 Jan 2020 13:27:00 +0530 Subject: [PATCH] sm8150: squashed commit for fixing wrong print format specifiers * origin/gcc-fixes: (15 commits) qcom: mem-offline: fix various formatting errors sound: usb: Fix wrong uaudio_dbg() formatting msm: ipa: Fix IPAERR_RL formatting errors msm: ipa3: Fix IPAWANDBG formatting errors backlight: qcom-spmi-wled: fix formatting error techpack: data: shs: rmnet_shs_wq: fix formatting error drm: msm: fix numerous formatting errors bus: mhi: fix formatting errors iommu: fix formatting errors adsprpc: fix formatting errors thermal: qcom: qmi_sensors: fix formatting error power: qcom: fix formatting errors touchscreen: goodix_driver_gt9886: fix formatting errors msm: gsi: fix formatting error Makefile: suppress all format warnings Signed-off-by: UtsavBalar1231 --- Makefile | 1 + drivers/bus/mhi/core/mhi_main.c | 2 +- drivers/char/adsprpc.c | 6 +++--- drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c | 2 +- drivers/gpu/drm/msm/sde/sde_crtc.c | 2 +- drivers/gpu/drm/msm/sde/sde_hw_interrupts.c | 2 +- drivers/gpu/drm/msm/sde/sde_kms.c | 2 +- .../goodix_driver_gt9886/goodix_gtx8_update.c | 2 +- .../goodix_driver_gt9886/goodix_ts_core.c | 2 +- drivers/iommu/arm-smmu-debug.c | 4 ++-- drivers/iommu/arm-smmu.c | 10 +++++----- drivers/power/supply/qcom/qpnp-qnovo5.c | 2 +- drivers/power/supply/qcom/smb5-lib.c | 2 +- drivers/soc/qcom/mem-offline.c | 12 ++++++------ drivers/thermal/qcom/qmi_sensors.c | 2 +- drivers/video/backlight/qcom-spmi-wled.c | 2 +- techpack/data/drivers/rmnet/shs/rmnet_shs_wq.c | 3 ++- 17 files changed, 30 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index abcd034327e2..e564e07d2ae2 100644 --- a/Makefile +++ b/Makefile @@ -706,6 +706,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context) KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias) +KBUILD_CFLAGS += $(call cc-disable-warning, format) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) diff --git a/drivers/bus/mhi/core/mhi_main.c b/drivers/bus/mhi/core/mhi_main.c index a2f473bc4038..334a31722447 100644 --- a/drivers/bus/mhi/core/mhi_main.c +++ b/drivers/bus/mhi/core/mhi_main.c @@ -122,7 +122,7 @@ static void mhi_reg_write_enqueue(struct mhi_controller *mhi_cntrl, q_index = q_index & (REG_WRITE_QUEUE_LEN - 1); - MHI_ASSERT(mhi_cntrl->reg_write_q[q_index].valid, "queue full idx %d"); + MHI_ASSERT(mhi_cntrl->reg_write_q[q_index].valid, "queue full idx"); mhi_cntrl->reg_write_q[q_index].reg_addr = reg_addr; mhi_cntrl->reg_write_q[q_index].val = val; diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c index d37fb99f3f10..d583ca9d207e 100644 --- a/drivers/char/adsprpc.c +++ b/drivers/char/adsprpc.c @@ -3027,13 +3027,13 @@ static ssize_t fastrpc_debugfs_read(struct file *filp, char __user *buffer, len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len, "%-7s", chan->subsys); len += scnprintf(fileinfo + len, - DEBUGFS_SIZE - len, "|%-10u", + DEBUGFS_SIZE - len, "|%-10llu", chan->sesscount); len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len, "|%-14d", chan->issubsystemup); len += scnprintf(fileinfo + len, - DEBUGFS_SIZE - len, "|%-9u", + DEBUGFS_SIZE - len, "|%-9llu", chan->ssrcount); for (j = 0; j < chan->sesscount; j++) { sess_used += chan->session[j].used; @@ -3089,7 +3089,7 @@ static ssize_t fastrpc_debugfs_read(struct file *filp, char __user *buffer, len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len, "%s %7s %d\n", "sessionid", ":", fl->sessionid); len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len, - "%s %8s %u\n", "ssrcount", ":", fl->ssrcount); + "%s %8s %llu\n", "ssrcount", ":", fl->ssrcount); len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len, "%s %14s %d\n", "pd", ":", fl->pd); len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len, diff --git a/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c b/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c index 5d23ee7ef70e..537acf8e24d7 100644 --- a/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c +++ b/drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c @@ -1145,7 +1145,7 @@ static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl, goto error; } - pr_debug("cmd tx type=%02x cmd=%02x len=%d last=%d\n", msg->type, + pr_debug("cmd tx type=%02x cmd=%02x len=%ld last=%d\n", msg->type, msg->tx_len ? *((u8 *)msg->tx_buf) : 0, msg->tx_len, (msg->flags & MIPI_DSI_MSG_LASTCOMMAND) != 0); diff --git a/drivers/gpu/drm/msm/sde/sde_crtc.c b/drivers/gpu/drm/msm/sde/sde_crtc.c index 1e0c1b8bbdbf..2d1e93224abb 100644 --- a/drivers/gpu/drm/msm/sde/sde_crtc.c +++ b/drivers/gpu/drm/msm/sde/sde_crtc.c @@ -857,7 +857,7 @@ static ssize_t measured_fps_show(struct device *device, fps_int = (uint64_t) sde_crtc->fps_info.measured_fps; fps_decimal = do_div(fps_int, 10); return scnprintf(buf, PAGE_SIZE, - "fps: %d.%d duration:%d frame_count:%llu\n", fps_int, fps_decimal, + "fps: %lld.%lld duration:%d frame_count:%llu\n", fps_int, fps_decimal, sde_crtc->fps_info.fps_periodic_duration, frame_count); } diff --git a/drivers/gpu/drm/msm/sde/sde_hw_interrupts.c b/drivers/gpu/drm/msm/sde/sde_hw_interrupts.c index 0fc778e35f88..c34aed434dca 100644 --- a/drivers/gpu/drm/msm/sde/sde_hw_interrupts.c +++ b/drivers/gpu/drm/msm/sde/sde_hw_interrupts.c @@ -1553,7 +1553,7 @@ struct sde_hw_intr *sde_hw_intr_init(void __iomem *addr, } if (count <= 0 || count > MDSS_INTR_MAX) { - pr_err("wrong mapping of supported irqs 0x%x\n", + pr_err("wrong mapping of supported irqs 0x%lx\n", m->mdss_irqs[0]); ret = -EINVAL; goto exit; diff --git a/drivers/gpu/drm/msm/sde/sde_kms.c b/drivers/gpu/drm/msm/sde/sde_kms.c index 134c49e2e656..980fd6cb0345 100644 --- a/drivers/gpu/drm/msm/sde/sde_kms.c +++ b/drivers/gpu/drm/msm/sde/sde_kms.c @@ -3610,7 +3610,7 @@ static int sde_kms_hw_init(struct msm_kms *kms) sde_kms->hw_sid = sde_hw_sid_init(sde_kms->sid, sde_kms->sid_len, sde_kms->catalog); if (IS_ERR(sde_kms->hw_sid)) { - SDE_ERROR("failed to init sid %d\n", PTR_ERR(sde_kms->hw_sid)); + SDE_ERROR("failed to init sid %ld\n", PTR_ERR(sde_kms->hw_sid)); sde_kms->hw_sid = NULL; goto power_error; } diff --git a/drivers/input/touchscreen/goodix_driver_gt9886/goodix_gtx8_update.c b/drivers/input/touchscreen/goodix_driver_gt9886/goodix_gtx8_update.c index a5d2c1e5e326..473a26ab3caa 100644 --- a/drivers/input/touchscreen/goodix_driver_gt9886/goodix_gtx8_update.c +++ b/drivers/input/touchscreen/goodix_driver_gt9886/goodix_gtx8_update.c @@ -286,7 +286,7 @@ static int goodix_check_update(struct goodix_ts_device *dev, ts_info("pid_len=%d\n",dev->reg.pid_len); ts_info("tp.pid=%s fw.pid=%s\n",fw_ver.pid,fw_info->fw_pid); if (memcmp(fw_ver.pid, fw_info->fw_pid, dev->reg.pid_len)) { - ts_err("tp.pid=0x%x fw.pid=0x%x\n",fw_ver.pid,fw_info->fw_pid); + ts_err("tp.pid=0x%s fw.pid=0x%hhn\n",fw_ver.pid,fw_info->fw_pid); ts_err("Product ID is not match"); return -EPERM; } diff --git a/drivers/input/touchscreen/goodix_driver_gt9886/goodix_ts_core.c b/drivers/input/touchscreen/goodix_driver_gt9886/goodix_ts_core.c index 8a1570be805a..3d16ab2e70d7 100644 --- a/drivers/input/touchscreen/goodix_driver_gt9886/goodix_ts_core.c +++ b/drivers/input/touchscreen/goodix_driver_gt9886/goodix_ts_core.c @@ -732,7 +732,7 @@ static void release_all_touches(struct goodix_ts_core *core_data) input_mt_slot(core_data->input_dev, i); input_mt_report_slot_state(core_data->input_dev, type, 0); } - ts_err("enter:%s core_data->touch_id=%d\n", __func__, core_data->touch_id); + ts_err("enter:%s core_data->touch_id=%ld\n", __func__, core_data->touch_id); core_data->sleep_finger = core_data->touch_id; core_data->touch_id = 0; input_sync(core_data->input_dev); diff --git a/drivers/iommu/arm-smmu-debug.c b/drivers/iommu/arm-smmu-debug.c index 6454dda70f9b..666088bacc73 100644 --- a/drivers/iommu/arm-smmu-debug.c +++ b/drivers/iommu/arm-smmu-debug.c @@ -128,7 +128,7 @@ void arm_smmu_debug_dump_tbu_testbus(struct device *dev, void __iomem *tbu_base, arm_smmu_debug_program_tbu_testbus(tbu_base, tcu_base, testbus_version, TBU_CLK_GATE_CONTROLLER_TESTBUS); - dev_info(dev, "testbus_sel: 0x%lx val: 0x%llx\n", + dev_info(dev, "testbus_sel: 0x%x val: 0x%x\n", arm_smmu_debug_tbu_testbus_select(tbu_base, tcu_base, testbus_version, READ, 0), arm_smmu_debug_tbu_testbus_output(tbu_base, @@ -227,7 +227,7 @@ void arm_smmu_debug_dump_tcu_testbus(struct device *dev, void __iomem *base, /* program ARM_SMMU_TESTBUS_SEL_HLOS1_NS to select TCU clk testbus*/ arm_smmu_debug_tcu_testbus_select(base, tcu_base, CLK_TESTBUS, WRITE, TCU_CLK_TESTBUS_SEL); - dev_info(dev, "Programming Tcu clk gate controller: testbus_sel: 0x%lx\n", + dev_info(dev, "Programming Tcu clk gate controller: testbus_sel: 0x%x\n", arm_smmu_debug_tcu_testbus_select(base, tcu_base, CLK_TESTBUS, READ, 0)); } diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 483de0e714d7..7c5328397f77 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1596,7 +1596,7 @@ static void print_ctx_regs(struct arm_smmu_device *smmu, struct arm_smmu_cfg dev_err(smmu->dev, "FAR = 0x%016llx\n", readq_relaxed(cb_base + ARM_SMMU_CB_FAR)); - dev_err(smmu->dev, "PAR = 0x%pK\n", + dev_err(smmu->dev, "PAR = 0x%lldK\n", readq_relaxed(cb_base + ARM_SMMU_CB_PAR)); dev_err(smmu->dev, @@ -1616,15 +1616,15 @@ static void print_ctx_regs(struct arm_smmu_device *smmu, struct arm_smmu_cfg (fsr & 0x80000000) ? "MULTI " : ""); if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) { - dev_err(smmu->dev, "TTBR0 = 0x%pK\n", + dev_err(smmu->dev, "TTBR0 = 0x%dK\n", readl_relaxed(cb_base + ARM_SMMU_CB_TTBR0)); - dev_err(smmu->dev, "TTBR1 = 0x%pK\n", + dev_err(smmu->dev, "TTBR1 = 0x%dK\n", readl_relaxed(cb_base + ARM_SMMU_CB_TTBR1)); } else { - dev_err(smmu->dev, "TTBR0 = 0x%pK\n", + dev_err(smmu->dev, "TTBR0 = 0x%lldK\n", readq_relaxed(cb_base + ARM_SMMU_CB_TTBR0)); if (stage1) - dev_err(smmu->dev, "TTBR1 = 0x%pK\n", + dev_err(smmu->dev, "TTBR1 = 0x%lldK\n", readq_relaxed(cb_base + ARM_SMMU_CB_TTBR1)); } diff --git a/drivers/power/supply/qcom/qpnp-qnovo5.c b/drivers/power/supply/qcom/qpnp-qnovo5.c index 9ded6568423b..d00ff6269ab4 100644 --- a/drivers/power/supply/qcom/qpnp-qnovo5.c +++ b/drivers/power/supply/qcom/qpnp-qnovo5.c @@ -312,7 +312,7 @@ static int qnovo5_parse_dt(struct qnovo *chip) chip->pinctrl = devm_pinctrl_get(chip->dev); if (IS_ERR(chip->pinctrl)) { - pr_err("Couldn't get pinctrl rc=%d\n", PTR_ERR(chip->pinctrl)); + pr_err("Couldn't get pinctrl rc=%ld\n", PTR_ERR(chip->pinctrl)); chip->pinctrl = NULL; } diff --git a/drivers/power/supply/qcom/smb5-lib.c b/drivers/power/supply/qcom/smb5-lib.c index fbe222a91126..85c5021bc104 100644 --- a/drivers/power/supply/qcom/smb5-lib.c +++ b/drivers/power/supply/qcom/smb5-lib.c @@ -8650,7 +8650,7 @@ static void apsd_timer_cb(unsigned long data) { struct smb_charger *chg = (struct smb_charger *)data; - smblib_dbg(chg, PR_MISC, "APSD Extented timer timeout at %lld\n", + smblib_dbg(chg, PR_MISC, "APSD Extented timer timeout at %d\n", jiffies_to_msecs(jiffies)); chg->apsd_ext_timeout = true; diff --git a/drivers/soc/qcom/mem-offline.c b/drivers/soc/qcom/mem-offline.c index a54c2b7b0ee9..f1fe26dd07ea 100644 --- a/drivers/soc/qcom/mem-offline.c +++ b/drivers/soc/qcom/mem-offline.c @@ -307,7 +307,7 @@ static int mem_change_refresh_state(struct memory_notify *mn, if (mem_sec_state[idx] == state) { /* we shouldn't be getting this request */ - pr_warn("mem-offline: state of mem%d block already in %s state. Ignoring refresh state change request\n", + pr_warn("mem-offline: state of mem%ld block already in %s state. Ignoring refresh state change request\n", sec_nr, online ? "online" : "offline"); return 0; } @@ -353,14 +353,14 @@ static int mem_event_callback(struct notifier_block *self, if (sec_nr > end_section_nr || sec_nr < start_section_nr) { if (action == MEM_ONLINE || action == MEM_OFFLINE) - pr_info("mem-offline: %s mem%d, but not our block. Not performing any action\n", + pr_info("mem-offline: %s mem%ld, but not our block. Not performing any action\n", action == MEM_ONLINE ? "Onlined" : "Offlined", sec_nr); return NOTIFY_OK; } switch (action) { case MEM_GOING_ONLINE: - pr_debug("mem-offline: MEM_GOING_ONLINE : start = 0x%lx end = 0x%lx", + pr_debug("mem-offline: MEM_GOING_ONLINE : start = 0x%llx end = 0x%llx", start_addr, end_addr); ++mem_info[(sec_nr - start_section_nr + MEMORY_ONLINE * idx) / sections_per_block].fail_count; @@ -383,7 +383,7 @@ static int mem_event_callback(struct notifier_block *self, (void *)sec_nr); break; case MEM_GOING_OFFLINE: - pr_debug("mem-offline: MEM_GOING_OFFLINE : start = 0x%lx end = 0x%lx", + pr_debug("mem-offline: MEM_GOING_OFFLINE : start = 0x%llx end = 0x%llx", start_addr, end_addr); ++mem_info[(sec_nr - start_section_nr + MEMORY_OFFLINE * idx) / sections_per_block].fail_count; @@ -407,7 +407,7 @@ static int mem_event_callback(struct notifier_block *self, (void *)sec_nr); break; case MEM_CANCEL_ONLINE: - pr_info("mem-offline: MEM_CANCEL_ONLINE: start = 0x%lx end = 0x%lx", + pr_info("mem-offline: MEM_CANCEL_ONLINE: start = 0x%llx end = 0x%llx", start_addr, end_addr); mem_change_refresh_state(mn, MEMORY_OFFLINE); break; @@ -590,7 +590,7 @@ static int mem_parse_dt(struct platform_device *pdev) mailbox.mbox = mbox_request_channel(&mailbox.cl, 0); if (IS_ERR(mailbox.mbox)) { - pr_err("mem-offline: failed to get mailbox channel %pK %d\n", + pr_err("mem-offline: failed to get mailbox channel %pK %ld\n", mailbox.mbox, PTR_ERR(mailbox.mbox)); return PTR_ERR(mailbox.mbox); } diff --git a/drivers/thermal/qcom/qmi_sensors.c b/drivers/thermal/qcom/qmi_sensors.c index 7bca52588f51..c095caef7407 100644 --- a/drivers/thermal/qcom/qmi_sensors.c +++ b/drivers/thermal/qcom/qmi_sensors.c @@ -384,7 +384,7 @@ static int qmi_register_sensor_device(struct qmi_sensor *qmi_sens) if (IS_ERR(qmi_sens->tz_dev)) { ret = PTR_ERR(qmi_sens->tz_dev); if (ret != -ENODEV) - pr_err("sensor register failed for %s, ret:%ld\n", + pr_err("sensor register failed for %s, ret:%d\n", qmi_sens->qmi_name, ret); qmi_sens->tz_dev = NULL; return ret; diff --git a/drivers/video/backlight/qcom-spmi-wled.c b/drivers/video/backlight/qcom-spmi-wled.c index 830ac900038a..62525fc0daec 100644 --- a/drivers/video/backlight/qcom-spmi-wled.c +++ b/drivers/video/backlight/qcom-spmi-wled.c @@ -1605,7 +1605,7 @@ static int wled_get_max_avail_current(struct led_classdev *led_cdev, /* Clamp the sink current to maximum FSC */ *max_current = min(i_sink_ma, max_fsc_ma); - pr_debug("i_sink_ma: %d\n", i_sink_ma); + pr_debug("i_sink_ma: %lld\n", i_sink_ma); return 0; } diff --git a/techpack/data/drivers/rmnet/shs/rmnet_shs_wq.c b/techpack/data/drivers/rmnet/shs/rmnet_shs_wq.c index 5f9572c3cadc..dcce60499fdb 100644 --- a/techpack/data/drivers/rmnet/shs/rmnet_shs_wq.c +++ b/techpack/data/drivers/rmnet/shs/rmnet_shs_wq.c @@ -1208,6 +1208,7 @@ int rmnet_shs_wq_check_cpu_move_for_ep(u16 current_cpu, u16 dest_cpu, struct rmnet_shs_wq_ep_s *ep) { u16 cpu_in_rps_mask = 0; + u16 __cpu_isolated_mask = 0; if (!ep) { rmnet_shs_crit_err[RMNET_SHS_WQ_EP_ACCESS_ERR]++; @@ -1222,7 +1223,7 @@ int rmnet_shs_wq_check_cpu_move_for_ep(u16 current_cpu, u16 dest_cpu, cpu_in_rps_mask = (1 << dest_cpu) & ep->rps_config_msk; rm_err("SHS_MASK: cur cpu [%d] | dest_cpu [%d] | " - "cpu isolation_mask = 0x%x | ep_rps_mask = 0x%x | " + "cpu isolation_mask = 0x%d | ep_rps_mask = 0x%d | " "cpu_online(dest) = %d cpu_in_rps_mask = %d | " "cpu isolated(dest) = %d", current_cpu, dest_cpu, __cpu_isolated_mask, ep->rps_config_msk,