Commit 525ea1bc authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch irq/irqchip-spurious-printk into irq/irqchip-next 

Drop a whole bunch of unnecessary printks on error paths

* irq/irqchip-spurious-printk:
  irqchip: gic-pm: Remove redundant error log of clock bulk
  irqchip/sun4i: Remove unnecessary oom message
  irqchip/irq-imx-gpcv2: Remove unnecessary oom message
  irqchip/imgpdc: Remove unnecessary oom message
  irqchip/gic-v3-its: Remove unnecessary oom message
  irqchip/gic-v2m: Remove unnecessary oom message
  irqchip/exynos-combiner: Remove unnecessary oom message
parents 8124c8a6 21a49617

drivers/irqchip/exynos-combiner.c

+1 −3
Original line number Diff line number Diff line
@@ -179,10 +179,8 @@ static void __init combiner_init(void __iomem *combiner_base, 
	nr_irq = max_nr * IRQ_IN_COMBINER;



	combiner_data = kcalloc(max_nr, sizeof (*combiner_data), GFP_KERNEL);

	if (!combiner_data) {

		pr_warn("%s: could not allocate combiner data\n", __func__);

	if (!combiner_data)

		return;

	}



	combiner_irq_domain = irq_domain_add_linear(np, nr_irq,

				&combiner_irq_domain_ops, combiner_data);

drivers/irqchip/irq-gic-pm.c

+1 −3
Original line number Diff line number Diff line
@@ -30,10 +30,8 @@ static int gic_runtime_resume(struct device *dev) 
	int ret;



	ret = clk_bulk_prepare_enable(data->num_clocks, chip_pm->clks);

	if (ret) {

		dev_err(dev, "clk_enable failed: %d\n", ret);

	if (ret)

		return ret;

	}



	/*

	 * On the very first resume, the pointer to chip_pm->chip_data

drivers/irqchip/irq-gic-v2m.c

+1 −3
Original line number Diff line number Diff line
@@ -323,10 +323,8 @@ static int __init gicv2m_init_one(struct fwnode_handle *fwnode, 
	struct v2m_data *v2m;



	v2m = kzalloc(sizeof(struct v2m_data), GFP_KERNEL);

	if (!v2m) {

		pr_err("Failed to allocate struct v2m_data.\n");

	if (!v2m)

		return -ENOMEM;

	}



	INIT_LIST_HEAD(&v2m->entry);

	v2m->fwnode = fwnode;

drivers/irqchip/irq-gic-v3-its.c

+2 −6
Original line number Diff line number Diff line
@@ -4895,10 +4895,8 @@ static int its_init_vpe_domain(void) 
	entries = roundup_pow_of_two(nr_cpu_ids);

	vpe_proxy.vpes = kcalloc(entries, sizeof(*vpe_proxy.vpes),

				 GFP_KERNEL);

	if (!vpe_proxy.vpes) {

		pr_err("ITS: Can't allocate GICv4 proxy device array\n");

	if (!vpe_proxy.vpes)

		return -ENOMEM;

	}



	/* Use the last possible DevID */

	devid = GENMASK(device_ids(its) - 1, 0);
@@ -5314,10 +5312,8 @@ static void __init acpi_table_parse_srat_its(void) 


	its_srat_maps = kmalloc_array(count, sizeof(struct its_srat_map),

				      GFP_KERNEL);

	if (!its_srat_maps) {

		pr_warn("SRAT: Failed to allocate memory for its_srat_maps!\n");

	if (!its_srat_maps)

		return;

	}



	acpi_table_parse_entries(ACPI_SIG_SRAT,

			sizeof(struct acpi_table_srat),

drivers/irqchip/irq-imgpdc.c

+2 −6
Original line number Diff line number Diff line
@@ -316,10 +316,8 @@ static int pdc_intc_probe(struct platform_device *pdev) 


	/* Allocate driver data */

	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv) {

		dev_err(&pdev->dev, "cannot allocate device data\n");

	if (!priv)

		return -ENOMEM;

	}

	raw_spin_lock_init(&priv->lock);

	platform_set_drvdata(pdev, priv);
@@ -356,10 +354,8 @@ static int pdc_intc_probe(struct platform_device *pdev) 
	/* Get peripheral IRQ numbers */

	priv->perip_irqs = devm_kcalloc(&pdev->dev, 4, priv->nr_perips,

					GFP_KERNEL);

	if (!priv->perip_irqs) {

		dev_err(&pdev->dev, "cannot allocate perip IRQ list\n");

	if (!priv->perip_irqs)

		return -ENOMEM;

	}

	for (i = 0; i < priv->nr_perips; ++i) {

		irq = platform_get_irq(pdev, 1 + i);

		if (irq < 0)