From patchwork Tue May 14 23:49:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10944121 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7D7351390 for ; Wed, 15 May 2019 00:11:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D32F288CA for ; Wed, 15 May 2019 00:11:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61CD2289D0; Wed, 15 May 2019 00:11:14 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 E2CD6288CA for ; Wed, 15 May 2019 00:11:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726783AbfEOALN (ORCPT ); Tue, 14 May 2019 20:11:13 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:42919 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726791AbfEOALM (ORCPT ); Tue, 14 May 2019 20:11:12 -0400 Received: by mail-qk1-f193.google.com with SMTP id d4so414296qkc.9 for ; Tue, 14 May 2019 17:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nNqDgtCqZVyfQ2EwawOl6xMn4dWOVkWKcnC+Xx6E71M=; b=TVRd076zGXN3z5268XQYt7cj3ohCmHQUXMNAVbzASa8sLpzCW5QYbcTZ3iN7586Yil r5hAl1mcMH0ooJ17FsXC/RdTCoQ92UME2GFTs4vWxiwpwXuml1LKT5dHqNDjfqFPxfLV gEaxwPG1phBnH+1siXJVaBAlx6aaUxjnhMNkxTrXCf2qRsIj2OKnoNdjBvArcjH9ckKH CF2BEDYfECEuPjl9D+SYMCv1QPknRgnnke3Nyy+PNngJqdK6FFEud/SceHQ1JsvnQRhd 6ez6t7MyBX7IPAkALX4uq2bQ6Toqfy8tzK3Hj506r1+91H1j94kD7ZORVCE8BgcjP+Sp sHfA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=nNqDgtCqZVyfQ2EwawOl6xMn4dWOVkWKcnC+Xx6E71M=; b=JJkVAuCFtEFswZvA5pDJpm0TyL0IZVMeYH3fCMuQya/YLNhE/856m6U6rxqEcr0zpY zr155sDlLpmEBa6SgMYSaKG/tusPkbVC5NDTaMkGBeWEwfu1SZhTZOuTBFi1wci5LPvR KyHpvmqQBCI4Wlyw1av+E4xiQXvwLDD0j3JS0DUzzZ2QqmSGD+FmdEciVPRiTaiF85XS 5gtPYN7jGtSqu4zByHaGAgAGwwTobDKjkibeMCNYTpwkOZD1SyMquJnkzmVytruwY11w IRvYxf9BmuruPQi8/IBopq747sKBEplkypMzeJFkw1y5yxFQasJGFoREu2drVi5bJYwp WDSg== X-Gm-Message-State: APjAAAVtAxpaHDQWebdPjR5hWQRLxazJgkBjYxe8xs1DXuaFmFuErBEj USfO0kWLcNEWRNp84IotIfzwaqq0RlE= X-Google-Smtp-Source: APXvYqwK1QHqdm3PoO2yrHjJjOBaXFqsUFYXSBeAR2Pr5bTBxWFSt2ZAB3bp2sc9W4qXhfBsNs0qAA== X-Received: by 2002:a37:6c84:: with SMTP id h126mr31564946qkc.168.1557879071517; Tue, 14 May 2019 17:11:11 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-49-251.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.49.251]) by smtp.gmail.com with ESMTPSA id o10sm249584qtg.5.2019.05.14.17.11.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2019 17:11:11 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hQhAx-0001O0-9Y; Tue, 14 May 2019 20:49:39 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 14/20] ibdiags: Obsolete mad_osd.h Date: Tue, 14 May 2019 20:49:30 -0300 Message-Id: <20190514234936.5175-15-jgg@ziepe.ca> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190514234936.5175-1-jgg@ziepe.ca> References: <20190514234936.5175-1-jgg@ziepe.ca> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jason Gunthorpe No need for this public header included in only one place with definitions that should not even exist in the public namespace. Signed-off-by: Jason Gunthorpe --- ibdiags/libibmad/include/infiniband/mad.h | 13 ++++- ibdiags/libibmad/include/infiniband/mad_osd.h | 50 +------------------ 2 files changed, 13 insertions(+), 50 deletions(-) diff --git a/ibdiags/libibmad/include/infiniband/mad.h b/ibdiags/libibmad/include/infiniband/mad.h index c95f1b10d08610..b36544988bfafd 100644 --- a/ibdiags/libibmad/include/infiniband/mad.h +++ b/ibdiags/libibmad/include/infiniband/mad.h @@ -35,7 +35,18 @@ #ifndef _MAD_H_ #define _MAD_H_ -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MAD_EXPORT +#define DEPRECATED __attribute__ ((deprecated)) #ifdef __cplusplus # define BEGIN_C_DECLS extern "C" { diff --git a/ibdiags/libibmad/include/infiniband/mad_osd.h b/ibdiags/libibmad/include/infiniband/mad_osd.h index 923be55ef95c93..061001bb8f82a6 100644 --- a/ibdiags/libibmad/include/infiniband/mad_osd.h +++ b/ibdiags/libibmad/include/infiniband/mad_osd.h @@ -1,49 +1 @@ -/* - * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. - * - * This software is available to you under a choice of one of two - * licenses. You may choose to be licensed under the terms of the GNU - * General Public License (GPL) Version 2, available from the file - * COPYING in the main directory of this source tree, or the - * OpenIB.org BSD license below: - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -#ifndef _MAD_OSD_H_ -#define _MAD_OSD_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define MAD_EXPORT -#define DEPRECATED __attribute__ ((deprecated)) - -#endif /* _MAD_OSD_H_ */ +#warning "This header is obsolete."