From patchwork Tue Sep 15 16:54:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 7188611 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A548A9F380 for ; Tue, 15 Sep 2015 17:10:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A452E2041C for ; Tue, 15 Sep 2015 17:10:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAD1720416 for ; Tue, 15 Sep 2015 17:10:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750837AbbIORKq (ORCPT ); Tue, 15 Sep 2015 13:10:46 -0400 Received: from mail-bn1bon0117.outbound.protection.outlook.com ([157.56.111.117]:46464 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750698AbbIORKp (ORCPT ); Tue, 15 Sep 2015 13:10:45 -0400 Received: from BY2PR03CA049.namprd03.prod.outlook.com (10.141.249.22) by DM2PR03MB574.namprd03.prod.outlook.com (10.141.84.150) with Microsoft SMTP Server (TLS) id 15.1.262.15; Tue, 15 Sep 2015 16:55:03 +0000 Received: from BN1BFFO11FD053.protection.gbl (2a01:111:f400:7c10::1:193) by BY2PR03CA049.outlook.office365.com (2a01:111:e400:2c5d::22) with Microsoft SMTP Server (TLS) id 15.1.274.16 via Frontend Transport; Tue, 15 Sep 2015 16:55:02 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD053.mail.protection.outlook.com (10.58.145.8) with Microsoft SMTP Server (TLS) id 15.1.262.18 via Frontend Transport; Tue, 15 Sep 2015 16:55:02 +0000 Received: from fabio-Latitude-E6410.am.freescale.net (fabio-Latitude-E6410.am.freescale.net [10.29.244.190]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t8FGswgo000533; Tue, 15 Sep 2015 09:54:59 -0700 From: Fabio Estevam To: CC: , , "Fabio Estevam" Subject: [PATCH v2] caam: desc: Remove unused JUMP_TYPE_MASK definition Date: Tue, 15 Sep 2015 13:54:53 -0300 Message-ID: <1442336093-22688-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD053; 1:zdNLy0fi+AEuBUEGc7oW05pSK2O5HMMl+Cl3OnhXJI4u3bs7KBwNe/q9YtKH36QMQ8AGZq0UssgKVASOn7vNe5d8jm7N3nf9W6KIJ11LmL14zQUufuzHGkUzUES+ZgxOZZl7SRZT1cAZxoj9fBqOs/xVdIftWvfjVl2XzmT1HzzPuU64Mi8OEAvzxVFNEwSDEksfsh8p55aEDHTFf7gt6XO9AKb0+RPpY3MQ+sRu8zkV25n7lJgh3fELk2+SopNAHx2nWEF+TWIljuEgjqgCvRWQ8aIolihacc1A5gFuLWEihHDIWSWutnP8HbcXEGdkgM0Me/pHUInjtI6BPVbwyz5yRjhS5mKN0Yns8LaI4ICxKCFDqKzvwourC7X8QfLTH2jcpkztVB661se8AlBW7Q== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(87936001)(106466001)(5001860100001)(4001540100001)(110136002)(46102003)(47776003)(36756003)(5007970100001)(107886002)(50986999)(5001830100001)(97736004)(23676002)(81156007)(189998001)(68736005)(64706001)(11100500001)(86362001)(33646002)(62966003)(2351001)(77096005)(50226001)(19580395003)(5001960100002)(6806004)(19580405001)(50466002)(5820100001)(92566002)(105606002)(229853001)(85426001)(77156002)(104016003)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR03MB574; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB574; 2:12hmZSLG05dEeKZWMEFBRPVniLol3oJJ0iWQt8lOBA0PXYlqSzTVyN1Ded8bejCbKuEUQ7Ulpgl9tdFBHH4cu69tlFn/i8SBxKZvUYTNs3YZKbh7nyPLqS77MOL2iBon0xJTsNuHnfYK7JgbmtYFjpClmvkfULp4V/u6f/hIdMo=; 3:TilX74vo3sfHC5KL9bl+rKz3u/78waPJYyRNqVq2vRLAVksY+C4vcBFXJB8mF/ySrTQdqRiRdBROxL+1Szg7v8nMTuf+xOwKpwfZm3RjmM0Npt9uJby7tGWF9sInWMFPM7ThSdkDPugTkjPWN/qy2U6u6cGQMJEH1NrI1hlUMUXqz0aiX10MmmuDD/ypkVxcpYxxiqRF0pumEMHAz1CouWF6ffNljjxzbNDN+63aedk=; 25:+5mQQJBvhOD1lTq02U6ASjeS8gzk63voR9m9NQUH5fxA2DgB0gtmZ9uYXxSMLHzdg+XHdCoid9b4YWLnQvwHdZyPRMpCFi8Xx0+AzNYqac1ipu0kePoOXOUMbHX9zIxVpCL8X1X9ie5C/cavNmbB3668m29wPdpCwrWV30PmfTQeZyEkYL/ckGrBB6uqxZ8eAhzotv1TAJgzmVE9usmzDqJNrhiYlvkvtAmL3ZhofZ2QOAwAfw8OIQVAbon8xtxVCf2SjxuJ+YsVPNV1xIU0EQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB574; X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB574; 20:PYW5Tt9IOcFINS/V2NmHiMjOFWn02Ldb7qRaPX+Gi153WUydGWHSErT2C0MhMUDWlc+N4S92mrNq34X/akkJqUmwqGaCabPTxQKSn29srxq9uxd+oRVzfpfPdW7nZDg0NIMvzn4v0xjpfJawz6jtPu0uDC9IAO5TfEiD8pIgnb6uxi9T1fneB/JYNvnJb3liPmoOG/Zatk9sQKUwsehlHJ/+z53kmfgLVHztCSj8pJjpGV2nE45m0q7KqEfPdQKvzBXp26yeDoSsXYztO4B4LveR65vYdJmjkx3yqotmD+aY8NubMEohSjdzdVDMn2gsNBrCrQg802sUoKUnW4Mx950Zu0SM7L1wc03SuKxcCMQ=; 4:eaeh8swV9YYz/Ia1wgVhXPmOHham7QdXR6gXygodiaCjAxPoS9xo5lABWbcO0iOlQnYPEzLyp9dOfKoRQ2+Fs5VSS3Flt1+ZKt2v5uLutjxQC804SMnvz811lusFCFqnFWIMjQA1oFNSBVz5/Su+8ikwA4KnkQeONGs+BHKCUmNSvALzjX0S2wR2MS7iDZ0QXvmVWdTvb6FkOjYLDVDZlHB0I9kWiXvOse1JqmbmmOM/4WwTCMJE9YAIAKDdYzKTtCWmqxLsk/lla1GxadipNnrKlxwm/xd7G9hAeFs2WbmuMFonC1YYaNRQOsNMs9USFhjwdLzoVkwxHkJc/hjhtvcE7Y/mVRXN+0R/F9LBqE4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520075)(5005006)(8121501046)(520078)(3002001); SRVR:DM2PR03MB574; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB574; X-Forefront-PRVS: 070092A9D3 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTJQUjAzTUI1NzQ7MjM6SFRrbXdDVnhHbkozK2pOa0pFZW1EZVJ5eWVt?= =?utf-8?B?MGc3NjRHbEF1ZUdjNXJLczU2dXF1MkRXUjFXbUpxQjVqMTFKcnRnR2QyWkc3?= =?utf-8?B?cXpuM3BQNFhPS0xOYU1hUHJYcG5SNERkQjZzd3k4cFc2SnZhYXVmSDd0TVJv?= =?utf-8?B?dEZXdjN2V1hVd3NHL2V1eFgvQzZNN1hDNmF5bGt6TEl4YlN1Y0VlZmVnNVNP?= =?utf-8?B?QXRPZlVycy9OS1VIVTdPbysrUUpINHNtOFNPR1ZQaGFERDdwZW1DRmp5NHFK?= =?utf-8?B?QUdxMVA0UElaemNFRnBkbzhKUVlwNUU0YnZZak9UQVl0eERKL3JuSlFRMnlC?= =?utf-8?B?MmdadzVaYnhvWVEyZStpUmJYTkhXb2VOdUl2SjFvWlVjdDZFWWFqQmtKc3p0?= =?utf-8?B?VXRpMkRVUVpZUnNpaHEzY0tPdFlOdWpEUUVYYTRZK1VnWnM4bEpacjVodlRB?= =?utf-8?B?OGNPY251Mmw4bXk1Ujg4bXdsdWd6TkkxRVVySlNodFB1d2VwUDlDOEt1Slh0?= =?utf-8?B?OW5FK0E4RUxsblBJUGJ1R283SDBpMXhnR0pQNlJzMTdBQzFFbjBNY08yN3li?= =?utf-8?B?eXFPc2J4Tk9mRFRyNURZOGpIc2FsZWttcTF6Y1hZS0VOZ3FIYnRWQXFJY1Za?= =?utf-8?B?RnJZSFNyNllWK1cxRWtQbUE1V2pHbUxBamtRUk0vanZRcGtaVWRMUkNkbk53?= =?utf-8?B?enpvTUN0d0NrbDI4NFdOTC84VXZNalVQeVNVTUp4TDl1NzBoa0FXWFhnck8x?= =?utf-8?B?dk4rUnhKa0tlTm5jaEcyL3pEekZYYzhCUStRQ0hQbTJpRmZJck5tT2Fneng5?= =?utf-8?B?ZlZ6MW9xcnhVOVJkc0NqRG82d1A0RVZ0YUZ6NUEwMG0vMVJ0QXlxZ2Z3RHdz?= =?utf-8?B?cUVOTGUrOHFHdm9PZys0NmFTWW45eTY3T0wrZ1hOQndRd0hXYzJoRitJQ0c4?= =?utf-8?B?UEpERUdLYkRMd0tSOVBNVDRLYVJSRjBQdjlZd20rUzVobnJGUkp1Z215ZWly?= =?utf-8?B?MjNXb0VaQU5zcE9XK29MWGdicjdyOEZLRVpTMHdVT2svanpXWHVvM3M0MUJF?= =?utf-8?B?RUd4VTMyRW9LUFYzd0VubGsxcWNkcjMwSEc1Q0ErcVhPYkVEQ2ZjN2FnTmVn?= =?utf-8?B?ejhOOEF4dlVSRVBhRzI0N2F6eFVRNlpXNG1mcXpKSktvSkVoRkt0cVZzdlZT?= =?utf-8?B?Q1cxM3NTNEtPUDMyQVhCMTRWN2pzbjBlTUxqelVjRjY2Y2FiaHBBYWswWkVq?= =?utf-8?B?elZTQzJEaFlIS1BpSmJTNFA1ditJWHBiTmc0b2t3eTdlQlVQUVh6RW05TTlM?= =?utf-8?B?b014UTR5OERhTmF5WElsRndaTzBBaTRzNHBMZkh3Rk05YXRRY1hVTmF2bEt0?= =?utf-8?B?TTFaYThQTTVPQ0dyZDFCcWgzZXlldmVCQUJLMXVDVURxOXkrOTZ2M01IRmdj?= =?utf-8?B?K1B2N2Y5ZmlqRFpKMitrdjRraVcvSThXQkxhMDE2SW5wSG81L1JSWHU0QTVn?= =?utf-8?B?UFhpR3QvKzRtSUw0dlQwdktldnAxVkJ3Ri9tQitrZHorKzl0WDlQdjFqR29q?= =?utf-8?B?U0VFejczNGNaNFZlRGYyeWp6MmpRK1BSeXZYb2MvMWsxRTVCL0F5OXEzRm1G?= =?utf-8?Q?15c84wvGPoZiDVgZh+r?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB574; 5:q4MFphpmhMBGDh/OhiWyZgar41QV2QC/U675/+K7hqPEcG4T5teUA8WEPt8KK3GBPWLJ4sDn6hcyVqbRWOyFTxrm53GKnlfcq5MAqG41sME3bDPggDBQiW/LJbrg/J+o/1EK+zTNpDqqmNZOD7KhpQ==; 24:sKF/uHYSn8Js+pSUfgnyCxh/JWdZ+zNan8byLEBfyN4S0RMfGeX3ogzUPOOwWubhsSwoqEqkZ1xcshFOMS7NjyJ3eDKmggtENlDJhAI7ltU=; 20:sM0Lb+sGRtiYDBBO1RrxhsNB60dGE97f7Jd1aI76azgArhu2Fh8oq6tV2OpkBk+IBI/0+Z0v7W9yrjUL+undTA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2015 16:55:02.0538 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB574 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit a1efb01feca597b ("jump_label, locking/static_keys: Rename JUMP_LABEL_TYPE_* and related helpers to the static_key* pattern") introduced the definition of JUMP_TYPE_MASK in include/linux/jump_label.h causing the following name collision: In file included from drivers/crypto/caam/desc_constr.h:7:0, from drivers/crypto/caam/ctrl.c:15: drivers/crypto/caam/desc.h:1495:0: warning: "JUMP_TYPE_MASK" redefined #define JUMP_TYPE_MASK (0x03 << JUMP_TYPE_SHIFT) ^ In file included from include/linux/module.h:19:0, from drivers/crypto/caam/compat.h:9, from drivers/crypto/caam/ctrl.c:11: include/linux/jump_label.h:131:0: note: this is the location of the previous definition #define JUMP_TYPE_MASK 1UL As JUMP_TYPE_MASK definition in desc.h is never used, we can safely remove it to avoid the name collision. Reported-by: Olof's autobuilder Signed-off-by: Fabio Estevam Reviewed-by: Horia Geant? --- Changes since v1: - Explain the commit that caused the name collision (Horia) drivers/crypto/caam/desc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/crypto/caam/desc.h b/drivers/crypto/caam/desc.h index 983d663..1e93c6a 100644 --- a/drivers/crypto/caam/desc.h +++ b/drivers/crypto/caam/desc.h @@ -1492,7 +1492,6 @@ struct sec4_sg_entry { #define JUMP_JSL (1 << JUMP_JSL_SHIFT) #define JUMP_TYPE_SHIFT 22 -#define JUMP_TYPE_MASK (0x03 << JUMP_TYPE_SHIFT) #define JUMP_TYPE_LOCAL (0x00 << JUMP_TYPE_SHIFT) #define JUMP_TYPE_NONLOCAL (0x01 << JUMP_TYPE_SHIFT) #define JUMP_TYPE_HALT (0x02 << JUMP_TYPE_SHIFT)