From patchwork Mon Aug 15 20:10:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Pettersson X-Patchwork-Id: 110087 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C8E1AB6F72 for ; Tue, 16 Aug 2011 06:10:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751528Ab1HOUKf (ORCPT ); Mon, 15 Aug 2011 16:10:35 -0400 Received: from fanny.its.uu.se ([130.238.4.241]:61633 "EHLO fanny.its.uu.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751287Ab1HOUKf (ORCPT ); Mon, 15 Aug 2011 16:10:35 -0400 Received: from fanny.its.uu.se (localhost [127.0.0.1]) by fanny.its.uu.se (Postfix) with ESMTP id 6A44E620B; Mon, 15 Aug 2011 22:10:32 +0200 (MSZ) Received: from pilspetsen.it.uu.se (pilspetsen.it.uu.se [130.238.18.39]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by fanny.its.uu.se (Postfix) with ESMTP id 10E1362B5; Mon, 15 Aug 2011 22:10:32 +0200 (MSZ) Received: (from mikpe@localhost) by pilspetsen.it.uu.se (8.14.4+Sun/8.14.4) id p7FKAVYB024412; Mon, 15 Aug 2011 22:10:31 +0200 (MEST) X-Authentication-Warning: pilspetsen.it.uu.se: mikpe set sender to mikpe@it.uu.se using -f MIME-Version: 1.0 Message-ID: <20041.32055.652850.148995@pilspetsen.it.uu.se> Date: Mon, 15 Aug 2011 22:10:31 +0200 From: Mikael Pettersson To: sparclinux@vger.kernel.org Subject: [PATCH] sparc64: remove unnecessary macros from spinlock_64.h Cc: linux-kernel@vger.kernel.org X-Mailer: VM 7.17 under Emacs 20.7.1 X-Virus-Scanned: ClamAV using ClamSMTP Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org The sparc64 spinlock_64.h contains a number of operations defined first as static inline functions, and then as macros with the same names and parameters as the functions. Maybe this was needed at some point in the past, but now nothing seems to depend on these macros (checked with a recursive grep looking for ifdefs on these names). Other archs don't define these identity-macros. So this patch deletes these unnecessary macros. Compile-tested with sparc64_defconfig. Signed-off-by: Mikael Pettersson --- -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-3.1-rc2/arch/sparc/include/asm/spinlock_64.h.~1~ 2011-05-19 06:06:34.000000000 +0200 +++ linux-3.1-rc2/arch/sparc/include/asm/spinlock_64.h 2011-08-15 20:51:27.000000000 +0200 @@ -210,14 +210,8 @@ static int inline arch_write_trylock(arc return result; } -#define arch_read_lock(p) arch_read_lock(p) #define arch_read_lock_flags(p, f) arch_read_lock(p) -#define arch_read_trylock(p) arch_read_trylock(p) -#define arch_read_unlock(p) arch_read_unlock(p) -#define arch_write_lock(p) arch_write_lock(p) #define arch_write_lock_flags(p, f) arch_write_lock(p) -#define arch_write_unlock(p) arch_write_unlock(p) -#define arch_write_trylock(p) arch_write_trylock(p) #define arch_read_can_lock(rw) (!((rw)->lock & 0x80000000UL)) #define arch_write_can_lock(rw) (!(rw)->lock)