Skip to content

Commit 525ea1b

Browse files
author
Marc Zyngier
committed
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
2 parents 8124c8a + 21a4961 commit 525ea1b

File tree

7 files changed

+10
-30
lines changed

7 files changed

+10
-30
lines changed

drivers/irqchip/exynos-combiner.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,8 @@ static void __init combiner_init(void __iomem *combiner_base,
179179
nr_irq = max_nr * IRQ_IN_COMBINER;
180180

181181
combiner_data = kcalloc(max_nr, sizeof (*combiner_data), GFP_KERNEL);
182-
if (!combiner_data) {
183-
pr_warn("%s: could not allocate combiner data\n", __func__);
182+
if (!combiner_data)
184183
return;
185-
}
186184

187185
combiner_irq_domain = irq_domain_add_linear(np, nr_irq,
188186
&combiner_irq_domain_ops, combiner_data);

drivers/irqchip/irq-gic-pm.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ static int gic_runtime_resume(struct device *dev)
3030
int ret;
3131

3232
ret = clk_bulk_prepare_enable(data->num_clocks, chip_pm->clks);
33-
if (ret) {
34-
dev_err(dev, "clk_enable failed: %d\n", ret);
33+
if (ret)
3534
return ret;
36-
}
3735

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

drivers/irqchip/irq-gic-v2m.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,8 @@ static int __init gicv2m_init_one(struct fwnode_handle *fwnode,
323323
struct v2m_data *v2m;
324324

325325
v2m = kzalloc(sizeof(struct v2m_data), GFP_KERNEL);
326-
if (!v2m) {
327-
pr_err("Failed to allocate struct v2m_data.\n");
326+
if (!v2m)
328327
return -ENOMEM;
329-
}
330328

331329
INIT_LIST_HEAD(&v2m->entry);
332330
v2m->fwnode = fwnode;

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4895,10 +4895,8 @@ static int its_init_vpe_domain(void)
48954895
entries = roundup_pow_of_two(nr_cpu_ids);
48964896
vpe_proxy.vpes = kcalloc(entries, sizeof(*vpe_proxy.vpes),
48974897
GFP_KERNEL);
4898-
if (!vpe_proxy.vpes) {
4899-
pr_err("ITS: Can't allocate GICv4 proxy device array\n");
4898+
if (!vpe_proxy.vpes)
49004899
return -ENOMEM;
4901-
}
49024900

49034901
/* Use the last possible DevID */
49044902
devid = GENMASK(device_ids(its) - 1, 0);
@@ -5314,10 +5312,8 @@ static void __init acpi_table_parse_srat_its(void)
53145312

53155313
its_srat_maps = kmalloc_array(count, sizeof(struct its_srat_map),
53165314
GFP_KERNEL);
5317-
if (!its_srat_maps) {
5318-
pr_warn("SRAT: Failed to allocate memory for its_srat_maps!\n");
5315+
if (!its_srat_maps)
53195316
return;
5320-
}
53215317

53225318
acpi_table_parse_entries(ACPI_SIG_SRAT,
53235319
sizeof(struct acpi_table_srat),

drivers/irqchip/irq-imgpdc.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,8 @@ static int pdc_intc_probe(struct platform_device *pdev)
316316

317317
/* Allocate driver data */
318318
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
319-
if (!priv) {
320-
dev_err(&pdev->dev, "cannot allocate device data\n");
319+
if (!priv)
321320
return -ENOMEM;
322-
}
323321
raw_spin_lock_init(&priv->lock);
324322
platform_set_drvdata(pdev, priv);
325323

@@ -356,10 +354,8 @@ static int pdc_intc_probe(struct platform_device *pdev)
356354
/* Get peripheral IRQ numbers */
357355
priv->perip_irqs = devm_kcalloc(&pdev->dev, 4, priv->nr_perips,
358356
GFP_KERNEL);
359-
if (!priv->perip_irqs) {
360-
dev_err(&pdev->dev, "cannot allocate perip IRQ list\n");
357+
if (!priv->perip_irqs)
361358
return -ENOMEM;
362-
}
363359
for (i = 0; i < priv->nr_perips; ++i) {
364360
irq = platform_get_irq(pdev, 1 + i);
365361
if (irq < 0)

drivers/irqchip/irq-imx-gpcv2.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,8 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,
228228
}
229229

230230
cd = kzalloc(sizeof(struct gpcv2_irqchip_data), GFP_KERNEL);
231-
if (!cd) {
232-
pr_err("%pOF: kzalloc failed!\n", node);
231+
if (!cd)
233232
return -ENOMEM;
234-
}
235233

236234
raw_spin_lock_init(&cd->rlock);
237235

drivers/irqchip/irq-sun4i.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,8 @@ static int __init sun4i_ic_of_init(struct device_node *node,
147147
struct device_node *parent)
148148
{
149149
irq_ic_data = kzalloc(sizeof(struct sun4i_irq_chip_data), GFP_KERNEL);
150-
if (!irq_ic_data) {
151-
pr_err("kzalloc failed!\n");
150+
if (!irq_ic_data)
152151
return -ENOMEM;
153-
}
154152

155153
irq_ic_data->enable_reg_offset = SUN4I_IRQ_ENABLE_REG_OFFSET;
156154
irq_ic_data->mask_reg_offset = SUN4I_IRQ_MASK_REG_OFFSET;
@@ -164,10 +162,8 @@ static int __init suniv_ic_of_init(struct device_node *node,
164162
struct device_node *parent)
165163
{
166164
irq_ic_data = kzalloc(sizeof(struct sun4i_irq_chip_data), GFP_KERNEL);
167-
if (!irq_ic_data) {
168-
pr_err("kzalloc failed!\n");
165+
if (!irq_ic_data)
169166
return -ENOMEM;
170-
}
171167

172168
irq_ic_data->enable_reg_offset = SUNIV_IRQ_ENABLE_REG_OFFSET;
173169
irq_ic_data->mask_reg_offset = SUNIV_IRQ_MASK_REG_OFFSET;

0 commit comments

Comments
 (0)