From patchwork Fri Jun 2 11:32:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9762355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BB7D060360 for ; Fri, 2 Jun 2017 11:34:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B324928323 for ; Fri, 2 Jun 2017 11:34:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5F9128504; Fri, 2 Jun 2017 11:34:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 675F428323 for ; Fri, 2 Jun 2017 11:34:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751276AbdFBLec (ORCPT ); Fri, 2 Jun 2017 07:34:32 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36408 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751264AbdFBLeb (ORCPT ); Fri, 2 Jun 2017 07:34:31 -0400 Received: by mail-wm0-f66.google.com with SMTP id k15so18368346wmh.3; Fri, 02 Jun 2017 04:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CdDqcDAeoNb9M5fHUm0A7XJkgcdzrdooFHCmJFNPkuE=; b=F6NRvqfvuuo1IdHZlXG5viRvMNMEaAM0+/GeUtvPjSgqEzRXjJ4tW+dKdzqiDTsTdW Sd0nJ1Egbms/Wa+oDRpfWOqBrlWqiHi/tip53sqWGWJjFnHyyAPmMIc2dbNIogwjtzDg SARTmCZ/Fr94vVI8ocryzvyeK0GKQPtWoXCllZ+T2zNZFvoCL9aCGaLEtPQfMgWAHZ06 HT8vlA1t/x3atTYctUkwYfQC29fJpLoEVRkMek/E37Mh5UUP+uVrz65ZkDr77wTrrucL JKACgQ4nwIDddCfb/LPczIHFxh1h5zW1PIlRI01JUDcDe4GmNPb2wWjytUJzA1I8lCFY /X+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CdDqcDAeoNb9M5fHUm0A7XJkgcdzrdooFHCmJFNPkuE=; b=HvXB0sAMSqiY4CNtx0+QWz4a5BKZzWKH2RsY4qzrprNgbdpXhZPZ8aQz+TW0feNqdh n4/YCKdNMp3b1mghxsqb5XGp/X/RRHuHk/hwOTrPwq+apAgq0mq3h+4AJDwn3nBvn0ML ATrgDzvRwXf/G4mVuk7NiOTyK0WWh6NXp5LKKQJtdIACbRBHza7zYGQmzhRz3lVZKczA Hq7fx4GAfNUrxAddGI5yaIKfXJ+tZUa2G50jav8jK0CmPBY+X0KRmKTav1OOGH/ljl1Q W2tRkszhTUDL5RLrjNEFMD2MGFCXOR5d/9xGGJ1u0yY6yJrEQbA1bFGVCyXRLmsqLnY1 lD6Q== X-Gm-Message-State: AODbwcAeIhA/ewPm2sDsla6FIcRyTtxShzZNM7GozXixbKnaSV6r7+Ri oy2xwGbe8j5Y9A== X-Received: by 10.28.238.20 with SMTP id m20mr2756366wmh.121.1496403269327; Fri, 02 Jun 2017 04:34:29 -0700 (PDT) Received: from Red.local (LFbn-1-7035-57.w90-116.abo.wanadoo.fr. [90.116.208.57]) by smtp.googlemail.com with ESMTPSA id c129sm2222754wmh.31.2017.06.02.04.34.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Jun 2017 04:34:28 -0700 (PDT) From: Corentin Labbe To: qla2xxx-upstream@qlogic.com, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH] qla2xxx: remove writeq/readq function definitions Date: Fri, 2 Jun 2017 13:32:25 +0200 Message-Id: <20170602113225.24816-1-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of rewriting write/readq, use linux/io-64-nonatomic-lo-hi.h which already have them. Signed-off-by: Corentin Labbe Reviewed-by: Bart Van Assche Acked-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_nx.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h index 77624eac95a4..71a41093530e 100644 --- a/drivers/scsi/qla2xxx/qla_nx.h +++ b/drivers/scsi/qla2xxx/qla_nx.h @@ -7,6 +7,8 @@ #ifndef __QLA_NX_H #define __QLA_NX_H +#include + /* * Following are the states of the Phantom. Phantom will set them and * Host will read to check if the fields are correct. @@ -819,21 +821,6 @@ struct qla82xx_uri_data_desc{ #define MIU_TEST_AGT_WRDATA_UPPER_LO (0x0b0) #define MIU_TEST_AGT_WRDATA_UPPER_HI (0x0b4) -#ifndef readq -static inline u64 readq(void __iomem *addr) -{ - return readl(addr) | (((u64) readl(addr + 4)) << 32LL); -} -#endif - -#ifndef writeq -static inline void writeq(u64 val, void __iomem *addr) -{ - writel(((u32) (val)), (addr)); - writel(((u32) (val >> 32)), (addr + 4)); -} -#endif - /* Request and response queue size */ #define REQUEST_ENTRY_CNT_82XX 128 /* Number of request entries. */ #define RESPONSE_ENTRY_CNT_82XX 128 /* Number of response entries.*/