From patchwork Mon Apr 22 23:11:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 2474861 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C209FDF23A for ; Mon, 22 Apr 2013 23:11:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753742Ab3DVXLX (ORCPT ); Mon, 22 Apr 2013 19:11:23 -0400 Received: from mail-ia0-f177.google.com ([209.85.210.177]:33949 "EHLO mail-ia0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753507Ab3DVXLW (ORCPT ); Mon, 22 Apr 2013 19:11:22 -0400 Received: by mail-ia0-f177.google.com with SMTP id y26so8828iab.36 for ; Mon, 22 Apr 2013 16:11:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=66I1dWCvdvlsdbp8BtaeYi0xxR1Vpz/nO97ZkG2cuMQ=; b=JoSff/8YdGScZ3nkE1g+zB3ScyO6YXb2PfBbyYItmvhCT8pLktRIAmMXvpBagxIOb5 AyQsdReIejr6oslQSkNqF6NziGr4MBJH/gBRfkClSNOu2oBAovspBO7Xj8sSg7sMV44o DRbOvH4VZE74nPQ3jogqF2wW5YpWADYMQZzyYp9nZLPV7yQT0D38R6vs6yhUjBSplyoh AZgApmFaiq5DCX53Hju+6mO697HSJIc4U59uAXCc4T5d7z3+0jllmAfjEr7SOBvb+sCa GmJFH9Gd6EBknnrRN97Iu1tb0/Kg8a0yWXP5U7/CDzFs3jHQ/ohghzqY3zYK9fnTwgn2 GcPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=66I1dWCvdvlsdbp8BtaeYi0xxR1Vpz/nO97ZkG2cuMQ=; b=aocOuLkhe0mYdsVh8ksFUekS1jrRGiNJsh4fuh5Gmk+zuYrm72rkfejekMXCGdQTyt C758Ux03DUSPHHy+ED3KkN7s8HHQmebrqa6EoYQQVtIlOHwyShehE3yOiJkFh4A454I6 hjh6B8v4NAuHTtXdYKq1I9+015Ezv7T+E6oZYougUaOnOLPoi+O+OknBwFXJlmBtauTJ my9nwyo7OMO991IYuijtdLXCmQWmiwRo3bXUAegiltmdK/oBmPhQqX5pURYi4NetjjVl Q6orwqOt+5TzVFboBY2bG0qse5M5wzMQFLCJdx/E5hpRHolE2NSscYhmm67rh3yBe0z3 U3rQ== X-Received: by 10.50.49.7 with SMTP id q7mr4555998ign.6.1366672282275; Mon, 22 Apr 2013 16:11:22 -0700 (PDT) Received: from localhost ([172.29.120.215]) by mx.google.com with ESMTPS id y5sm19676205igg.7.2013.04.22.16.11.21 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 22 Apr 2013 16:11:21 -0700 (PDT) Subject: [PATCH v4 10/22] PCI: Drop msi_lower_address_reg() and msi_upper_address_reg() macros To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Gavin Shan Date: Mon, 22 Apr 2013 17:11:20 -0600 Message-ID: <20130422231120.32621.81415.stgit@bhelgaas-glaptop> In-Reply-To: <20130422230012.32621.15224.stgit@bhelgaas-glaptop> References: <20130422230012.32621.15224.stgit@bhelgaas-glaptop> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlJDfkA0yQ9L/7OHecRS0Uvx81HKPwFMe/rxfkHTR6eNJUk/OdzYf1KNG1d+mSnEohJf1wCNDD/TTW7+4ZETicABB8gtp56flgH0Am23jmOBOmCwy8GrvXgnSu0TEbZrjOPGoQMXK+Z3d8IMLQ/pGwpLVTDr/TvIHMGQc5XF9kAARFpEnv0t1rsz407UtEXkaLElfXo3whuc3XufQdgjq1Hm1IjfaMOnmUUKTD4nupteBMaV+E= Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org msi_lower_address_reg() and msi_upper_address_reg() don't provide any useful abstraction, so drop them. Signed-off-by: Bjorn Helgaas --- drivers/pci/msi.c | 16 ++++++++-------- drivers/pci/msi.h | 2 -- 2 files changed, 8 insertions(+), 10 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/msi.c b/drivers/pci/msi.c index b1a60e0..7011c5d 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -244,11 +244,11 @@ void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg) int pos = dev->msi_cap; u16 data; - pci_read_config_dword(dev, msi_lower_address_reg(pos), - &msg->address_lo); + pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_LO, + &msg->address_lo); if (entry->msi_attrib.is_64) { - pci_read_config_dword(dev, msi_upper_address_reg(pos), - &msg->address_hi); + pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_HI, + &msg->address_hi); pci_read_config_word(dev, msi_data_reg(pos, 1), &data); } else { msg->address_hi = 0; @@ -304,11 +304,11 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) msgctl |= entry->msi_attrib.multiple << 4; pci_write_config_word(dev, pos + PCI_MSI_FLAGS, msgctl); - pci_write_config_dword(dev, msi_lower_address_reg(pos), - msg->address_lo); + pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_LO, + msg->address_lo); if (entry->msi_attrib.is_64) { - pci_write_config_dword(dev, msi_upper_address_reg(pos), - msg->address_hi); + pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_HI, + msg->address_hi); pci_write_config_word(dev, msi_data_reg(pos, 1), msg->data); } else { diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h index 6aa7b19..e5b87d6 100644 --- a/drivers/pci/msi.h +++ b/drivers/pci/msi.h @@ -6,8 +6,6 @@ #ifndef MSI_H #define MSI_H -#define msi_lower_address_reg(base) (base + PCI_MSI_ADDRESS_LO) -#define msi_upper_address_reg(base) (base + PCI_MSI_ADDRESS_HI) #define msi_data_reg(base, is64bit) \ (base + ((is64bit == 1) ? PCI_MSI_DATA_64 : PCI_MSI_DATA_32)) #define msi_mask_reg(base, is64bit) \