From patchwork Sun Jul 19 15:26:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 36240 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6JFSOQY021231 for ; Sun, 19 Jul 2009 15:28:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754676AbZGSP1I (ORCPT ); Sun, 19 Jul 2009 11:27:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754634AbZGSP1G (ORCPT ); Sun, 19 Jul 2009 11:27:06 -0400 Received: from mgw1.diku.dk ([130.225.96.91]:47154 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754709AbZGSP1B (ORCPT ); Sun, 19 Jul 2009 11:27:01 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw1.diku.dk (Postfix) with ESMTP id 896BB52C385; Sun, 19 Jul 2009 17:27:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at diku.dk Received: from mgw1.diku.dk ([127.0.0.1]) by localhost (mgw1.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TizUUzxpKrry; Sun, 19 Jul 2009 17:26:58 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw1.diku.dk (Postfix) with ESMTP id A481D52C325; Sun, 19 Jul 2009 17:26:58 +0200 (CEST) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id 3780C6DF88D; Sun, 19 Jul 2009 17:26:26 +0200 (CEST) Received: by ask.diku.dk (Postfix, from userid 3767) id 8FA93154B7F; Sun, 19 Jul 2009 17:26:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ask.diku.dk (Postfix) with ESMTP id 8E8D91547DF; Sun, 19 Jul 2009 17:26:58 +0200 (CEST) Date: Sun, 19 Jul 2009 17:26:58 +0200 (CEST) From: Julia Lawall To: kristen.c.accardi@intel.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 5/10] drivers/pci: Move a dereference below a NULL test Message-ID: MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Julia Lawall If the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that finds this problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; expression E,E1; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E=E1 when != i if (E == NULL||...) S + i = E->fld; // Signed-off-by: Julia Lawall --- drivers/pci/pcie/aspm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 3d27c97..fc8311b 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -668,10 +668,11 @@ out: void pcie_aspm_exit_link_state(struct pci_dev *pdev) { struct pci_dev *parent = pdev->bus->self; - struct pcie_link_state *link_state = parent->link_state; + struct pcie_link_state *link_state; - if (aspm_disabled || !pdev->is_pcie || !parent || !link_state) + if (aspm_disabled || !pdev->is_pcie || !parent || !parent->link_state) return; + link_state = parent->link_state; if (parent->pcie_type != PCI_EXP_TYPE_ROOT_PORT && parent->pcie_type != PCI_EXP_TYPE_DOWNSTREAM) return;