From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754621AbbIOPtH (ORCPT ); Tue, 15 Sep 2015 11:49:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57158 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753479AbbIOPtC (ORCPT ); Tue, 15 Sep 2015 11:49:02 -0400 Date: Tue, 15 Sep 2015 08:48:10 -0700 From: tip-bot for Marc Zyngier Message-ID: Cc: jiang.liu@linux.intel.com, hpa@zytor.com, majun258@huawei.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, marc.zyngier@arm.com Reply-To: marc.zyngier@arm.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, majun258@huawei.com, hpa@zytor.com, jiang.liu@linux.intel.com In-Reply-To: <1442147824-20971-1-git-send-email-marc.zyngier@arm.com> References: <1442147824-20971-1-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] platform-msi: Do not cache msi_desc in handler_data Git-Commit-ID: e4084a16bbe07957811c75dfb7c9bf25c5862ba0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e4084a16bbe07957811c75dfb7c9bf25c5862ba0 Gitweb: http://git.kernel.org/tip/e4084a16bbe07957811c75dfb7c9bf25c5862ba0 Author: Marc Zyngier AuthorDate: Sun, 13 Sep 2015 13:37:03 +0100 Committer: Thomas Gleixner CommitDate: Tue, 15 Sep 2015 17:06:29 +0200 platform-msi: Do not cache msi_desc in handler_data The current implementation of platform MSI caches the msi_desc pointer in irq_data::handler_data. This is a bit silly, as we also have irq_data::msi_desc, which is perfectly valid. Remove the useless assignment and simplify the whole flow. Reported-by: Ma Jun Signed-off-by: Marc Zyngier Reviewed-by: Jiang Liu Link: http://lkml.kernel.org/r/1442147824-20971-1-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- drivers/base/platform-msi.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c index 1857a5d..134483d 100644 --- a/drivers/base/platform-msi.c +++ b/drivers/base/platform-msi.c @@ -63,20 +63,8 @@ static int platform_msi_init(struct irq_domain *domain, unsigned int virq, irq_hw_number_t hwirq, msi_alloc_info_t *arg) { - struct irq_data *data; - - irq_domain_set_hwirq_and_chip(domain, virq, hwirq, - info->chip, info->chip_data); - - /* - * Save the MSI descriptor in handler_data so that the - * irq_write_msi_msg callback can retrieve it (and the - * associated device). - */ - data = irq_domain_get_irq_data(domain, virq); - data->handler_data = arg->desc; - - return 0; + return irq_domain_set_hwirq_and_chip(domain, virq, hwirq, + info->chip, info->chip_data); } #else #define platform_msi_set_desc NULL @@ -97,7 +85,7 @@ static void platform_msi_update_dom_ops(struct msi_domain_info *info) static void platform_msi_write_msg(struct irq_data *data, struct msi_msg *msg) { - struct msi_desc *desc = irq_data_get_irq_handler_data(data); + struct msi_desc *desc = irq_data_get_msi_desc(data); struct platform_msi_priv_data *priv_data; priv_data = desc->platform.msi_priv_data;