You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From 9821898bbfa5a21254baafe19b3cc97516fc6019 Mon Sep 17 00:00:00 2001
|
|
From: Matthias Brugger <mbrugger@suse.com>
|
|
Date: Thu, 14 Apr 2016 23:24:26 +0200
|
|
Subject: [PATCH 178/226] staging: fsl-mc: bus: Drop warning
|
|
|
|
When updating the irq_chip and msi_domain_ops, the code checkes for
|
|
already present functions.
|
|
When more then one ITS controller are present in the system,
|
|
irq_chip and msi_domain_ops got already set and a warning is invoked.
|
|
|
|
This patch deletes the warning, as the funtions are just already set to
|
|
the needed callbacks.
|
|
|
|
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/fsl-mc/bus/mc-msi.c | 12 ++++--------
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/staging/fsl-mc/bus/mc-msi.c
|
|
+++ b/drivers/staging/fsl-mc/bus/mc-msi.c
|
|
@@ -37,10 +37,8 @@ static void fsl_mc_msi_update_dom_ops(st
|
|
/*
|
|
* set_desc should not be set by the caller
|
|
*/
|
|
- if (WARN_ON(ops->set_desc))
|
|
- return;
|
|
-
|
|
- ops->set_desc = fsl_mc_msi_set_desc;
|
|
+ if (ops->set_desc == NULL)
|
|
+ ops->set_desc = fsl_mc_msi_set_desc;
|
|
}
|
|
|
|
static void __fsl_mc_msi_write_msg(struct fsl_mc_device *mc_bus_dev,
|
|
@@ -129,10 +127,8 @@ static void fsl_mc_msi_update_chip_ops(s
|
|
/*
|
|
* irq_write_msi_msg should not be set by the caller
|
|
*/
|
|
- if (WARN_ON(chip->irq_write_msi_msg))
|
|
- return;
|
|
-
|
|
- chip->irq_write_msi_msg = fsl_mc_msi_write_msg;
|
|
+ if (chip->irq_write_msi_msg == NULL)
|
|
+ chip->irq_write_msi_msg = fsl_mc_msi_write_msg;
|
|
}
|
|
|
|
/**
|