Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99E06C2BB1D for ; Fri, 13 Mar 2020 20:31:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C4E220753 for ; Fri, 13 Mar 2020 20:31:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727282AbgCMUbP (ORCPT ); Fri, 13 Mar 2020 16:31:15 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:46183 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726480AbgCMUbP (ORCPT ); Fri, 13 Mar 2020 16:31:15 -0400 Received: by mail-pg1-f194.google.com with SMTP id y30so5617979pga.13 for ; Fri, 13 Mar 2020 13:31:14 -0700 (PDT) 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=JFCp6e0kQJxo5K6JbWCw91PTHC+VB30q7KfTslceTus=; b=d1XX4uvbgWrv27wqj5odFFqV+c5gK26IiaTkFssx3BaCltT2/x2OE2NV+OwIv3vPoB YyskhvjG7XAimocW/mj8yHRYQMG0lbtRsay+ouo7ACn+b2ZHIsnXxxWb/MCHU/FHLVob B5xbQubCwWYMXCputUuTs8UIpsX2MogV9kroDcvzjpgja1X0o29TJfLxOUoaBfY7bROC WlVDoaLX0z8WKfTJHiO6mWCYEU6qqmiamv+dU0VKZIOTEnDDbRYAa0JQzFuo49jTwz/i YbEqACcP2QNrj/qqoQ+Gdh1eGJ83bSQ7Q8/nYMZJz/1o+YSpTBsDbsV0f5E+M42O0PR+ Bm5Q== X-Gm-Message-State: ANhLgQ3dtpRXFvLyFmEw4fge4VzCD/sASCi+kstSqrYeWlGA0mQEAq/t +3CYn4VkuIbX+u+8ziN0fGE= X-Google-Smtp-Source: ADFU+vuUYYHpT/GYlbnPKLItOWrFvlB35d4m3SWuggfZCZy+xrnpTJEJI3jQHKqlIW9rRWmyC4SURg== X-Received: by 2002:a63:3449:: with SMTP id b70mr14679900pga.242.1584131473833; Fri, 13 Mar 2020 13:31:13 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:4927:51b8:6d1e:6c02]) by smtp.gmail.com with ESMTPSA id m12sm12656000pjf.25.2020.03.13.13.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 13:31:13 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" , "James E . J . Bottomley" Cc: linux-scsi@vger.kernel.org, Christoph Hellwig , Andy Shevchenko , Greg Kroah-Hartman , Bart Van Assche , Mark Salter , Aurelien Jacquiot Subject: [PATCH v3 2/5] c6x: Include instead of duplicating it Date: Fri, 13 Mar 2020 13:30:59 -0700 Message-Id: <20200313203102.16613-3-bvanassche@acm.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200313203102.16613-1-bvanassche@acm.org> References: <20200313203102.16613-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Use the generic __{get,put}_unaligned_[bl]e() definitions instead of duplicating these. Since a later patch will add more definitions into , this patch ensures that these definitions have to be added only once. See also commit a7f626c1948a ("C6X: headers"). See also commit 6510d41954dc ("kernel: Move arches to use common unaligned access"). Acked-by: Mark Salter Cc: Aurelien Jacquiot Signed-off-by: Bart Van Assche --- arch/c6x/include/asm/unaligned.h | 65 +------------------------------- 1 file changed, 1 insertion(+), 64 deletions(-) diff --git a/arch/c6x/include/asm/unaligned.h b/arch/c6x/include/asm/unaligned.h index b56ba7110f5a..d628cc170564 100644 --- a/arch/c6x/include/asm/unaligned.h +++ b/arch/c6x/include/asm/unaligned.h @@ -10,6 +10,7 @@ #define _ASM_C6X_UNALIGNED_H #include +#include /* * The C64x+ can do unaligned word and dword accesses in hardware @@ -100,68 +101,4 @@ static inline void put_unaligned64(u64 val, const void *p) #endif -/* - * Cause a link-time error if we try an unaligned access other than - * 1,2,4 or 8 bytes long - */ -extern int __bad_unaligned_access_size(void); - -#define __get_unaligned_le(ptr) (typeof(*(ptr)))({ \ - sizeof(*(ptr)) == 1 ? *(ptr) : \ - (sizeof(*(ptr)) == 2 ? get_unaligned_le16((ptr)) : \ - (sizeof(*(ptr)) == 4 ? get_unaligned_le32((ptr)) : \ - (sizeof(*(ptr)) == 8 ? get_unaligned_le64((ptr)) : \ - __bad_unaligned_access_size()))); \ - }) - -#define __get_unaligned_be(ptr) (__force typeof(*(ptr)))({ \ - sizeof(*(ptr)) == 1 ? *(ptr) : \ - (sizeof(*(ptr)) == 2 ? get_unaligned_be16((ptr)) : \ - (sizeof(*(ptr)) == 4 ? get_unaligned_be32((ptr)) : \ - (sizeof(*(ptr)) == 8 ? get_unaligned_be64((ptr)) : \ - __bad_unaligned_access_size()))); \ - }) - -#define __put_unaligned_le(val, ptr) ({ \ - void *__gu_p = (ptr); \ - switch (sizeof(*(ptr))) { \ - case 1: \ - *(u8 *)__gu_p = (__force u8)(val); \ - break; \ - case 2: \ - put_unaligned_le16((__force u16)(val), __gu_p); \ - break; \ - case 4: \ - put_unaligned_le32((__force u32)(val), __gu_p); \ - break; \ - case 8: \ - put_unaligned_le64((__force u64)(val), __gu_p); \ - break; \ - default: \ - __bad_unaligned_access_size(); \ - break; \ - } \ - (void)0; }) - -#define __put_unaligned_be(val, ptr) ({ \ - void *__gu_p = (ptr); \ - switch (sizeof(*(ptr))) { \ - case 1: \ - *(u8 *)__gu_p = (__force u8)(val); \ - break; \ - case 2: \ - put_unaligned_be16((__force u16)(val), __gu_p); \ - break; \ - case 4: \ - put_unaligned_be32((__force u32)(val), __gu_p); \ - break; \ - case 8: \ - put_unaligned_be64((__force u64)(val), __gu_p); \ - break; \ - default: \ - __bad_unaligned_access_size(); \ - break; \ - } \ - (void)0; }) - #endif /* _ASM_C6X_UNALIGNED_H */