Merge "usb: phy: snps: Fix printk format compiler warnings" (a1617a1a) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/soc/qcom/msm_bus/msm_bus_of_rpmh.c

+4 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
		*/

		#define pr_fmt(fmt) "AXI: %s(): " fmt, __func__
		@@ -586,17 +586,17 @@ static int msm_bus_of_get_ids(struct platform_device *pdev,
		int num_ids, char prop_name)
		{
		int ret = 0;
		int size, i;
		int i;
		struct device_node *rule_node;
		int *ids = NULL;

		*num_ids = of_property_count_elems_of_size(dev_node, prop_name, size);
		*num_ids = of_property_count_u32_elems(dev_node, prop_name);
		if (!*num_ids) {
		dev_err(&pdev->dev, "No rule nodes, skipping node\n");
		ret = -ENXIO;
		}

		ids = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
		ids = devm_kcalloc(&pdev->dev, *num_ids, sizeof(u32), GFP_KERNEL);
		if (!ids)
		return -ENOMEM;

+3 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		*/

		#include <linux/module.h>
		@@ -400,7 +400,7 @@ static int msm_hsphy_init(struct usb_phy *uphy)
		if (phy->phy_rcal_reg) {
		rcal_code = readl_relaxed(phy->phy_rcal_reg) & phy->rcal_mask;

		dev_dbg(uphy->dev, "rcal_mask:%08x reg:%08x code:%08x\n",
		dev_dbg(uphy->dev, "rcal_mask:%08x reg:%pK code:%08x\n",
		phy->rcal_mask, phy->phy_rcal_reg, rcal_code);
		}

		@@ -653,7 +653,7 @@ static int msm_hsphy_probe(struct platform_device *pdev)
		dev_err(dev, "unable to read phy rcal mask\n");
		phy->phy_rcal_reg = NULL;
		}
		dev_dbg(dev, "rcal_mask:%08x reg:%08x\n", phy->rcal_mask,
		dev_dbg(dev, "rcal_mask:%08x reg:%pK\n", phy->rcal_mask,
		phy->phy_rcal_reg);
		}