From patchwork Thu Mar 1 10:31:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 130134 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2647471edc; Thu, 1 Mar 2018 02:58:25 -0800 (PST) X-Google-Smtp-Source: AG47ELvboXhvN8sgFfneim5ZtPVN7VabTXe4WWW6QyhuQM7s2tSSXA1jn15hEArK7PCoUnzfrZ8m X-Received: by 10.99.49.198 with SMTP id x189mr1203119pgx.135.1519901905737; Thu, 01 Mar 2018 02:58:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519901905; cv=none; d=google.com; s=arc-20160816; b=LJyOHg39xzbKJU2CsZY/xIxg3e1SFmldWcJRiO5yvz7qsGD1bhXZy+fWo1dLDB/9Xn IwjGLj6yQSrRL+XxGTkvsG6IduEUwmf4EuNDJvx1IhkAnMfPw6ukegDE3bNH3d9/Ry/e npB6rV9rudVyeIZq5/5lLnmzdpTJNdWwi+XHLnxspRCTDpyyqfHVjfKjFdZ9Vaux/TqR UKkNBBNvMaNIKZWNWuVgonS+XUIlwZSuQ4oLcRzhdJN0gk1tS86lF6pyBt4lEHChTQ0B DYjNcmKjOZg45IFs59u+9RGsJjREAMAnjP4FdYteydBjFsFxCIkVWwY9Yg9MgEL4BiFi w5RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=tQcJCeJtipdOWji3wF31asFzrAWdosv0W9U/2wqi0ms=; b=jzx8yE9Kmi/mRtwmMg3jcMxrKAL3FGhcoDqJ0AlWXDK2qE1TqnR/J6kGCIUfBDsIaa 9A4Ldc9J/GEMqQY1xfCnuZvmVnQg+5dAA2+APf7lHS5LhuruvHAxSBkK9o15jn+bMwY9 c6Q9kT1wVW85bVs/Ujr23EC7KkUXU1fzICydHgeR/1SDkAU6fHHdRzcI/8ZUINL9kTQi C7ufBMPFq2mIbzUg7eDfnxk+xE0UCAWyQvKrA6zzXIPqUROQ4R3CkoTjxmBQfn5TY7vZ +ra2Aj4Jw07VrUhsZX9hiAE8xExalf+3ZVk5y6H7kRnkC3cLhE6fP56FVUvD6N+9tw0q 5EhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y25si1488183pfe.206.2018.03.01.02.58.25; Thu, 01 Mar 2018 02:58:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967691AbeCAK6T (ORCPT + 28 others); Thu, 1 Mar 2018 05:58:19 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:34829 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967497AbeCAK6Q (ORCPT ); Thu, 1 Mar 2018 05:58:16 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MA0VM-1f2NSJ3v5c-00B0Xt; Thu, 01 Mar 2018 11:58:08 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Arnd Bergmann , Anshuman Khandual , Jens Axboe , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] staging: rts5208: rename SG_END macro Date: Thu, 1 Mar 2018 11:31:29 +0100 Message-Id: <20180301105641.1650792-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180301105641.1650792-1-arnd@arndb.de> References: <20180301105641.1650792-1-arnd@arndb.de> X-Provags-ID: V03:K0:cI0d93eubJLITURSOemRuh3Nu/D6iqsMGATXWmFCSnyjTxEttgE ojHsP7ZVE1AmD5f2QYQQBe6dv81rFbb4mVHcNyKAwY5QdRm59wuuIg2e/P88A36qCXR8zh7 MoCiKaOGayL6V6YYFofE38eMQWoI3tyPbuJNr5ER/bgykm+0Y4L0pTm8/kubYYbZnjLgc9j gKCsf2/LRj2ORJ7h9IkSg== X-UI-Out-Filterresults: notjunk:1; V01:K0:GKdY7W6/UtA=:y6s/qeB9Lg+msubeMzhdy/ MBIyoCMa+/FDqLY8k7vtV6LQd1eM+xXc/i6iq3MIxVoziFs0J183CwDXnbRuWadQwAK1Xy2Py aH2HcSCVqeVerAjJrbhTiMHVeWgNvdMfkwcCatCtIYSWrkaGJRlLMxZWOSwyoJDrIoGI52Eav V8xqASMF9fN9yfn78Iort7Ag9vmloSpYWRPLXOfesvHda9TTMDcWhBrp1/VlR7UMnQXXwp+9e oZem7X/m7ljysX83873HDZAG3n1mzum7tegxBskkRPUBCpTfvMuZJDRQh1npy1wy2wnxYcI5F z7e8Byk7qaCeL40BCI4mnkhSU0LSZ8866HEPRX4vJDE6o1TW7qPgmmUD2n7NrL/sZhbfiItvT O5AeurPvUemnM/pN6LhyOM3FAr5BYvP8tALqHQiFpiBKemDVrGDtPstSzPrL8YXNLOJfXTAfc DhqPTcekcqnE5cIqzPGM4Qa81+1JkvswoNzGyIilW280Xd2nWeNiB5kR9+N40pfSHN4j+2SxV oTq4Px6uSoiRWsXjL068IXXX0fnzhbMA0SXxR50CgSetZ77RUMkeIuPvZtbfpdcwI/yOxw84z d13/9GLPGwnmde67ESXHFR+jHETVOI8pfSmBDVZg33Jq5FC4bqVVBbPxR9zWBWwH3YriyRMD3 6pxEjqLW+LDLIBqfRD90+CuR/+EBCiGXGVfo8cAgrwBdb1SyIIpuMHGFE37U2E7htKuDmCt8v fkkp+VMsZXEPdUAqQHKXo6WlRovfjU7F0dZ6pA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A change to the generic scatterlist code caused a conflict with the rtsx card reader driver: In file included from drivers/staging/rts5208/rtsx.h:180, from drivers/staging/rts5208/rtsx.c:28: drivers/staging/rts5208/rtsx_chip.h:343: error: "SG_END" redefined [-Werror] This changes one instance of the driver to prefix SG_END and related constants. Fixes: 723fbf563a6a ("lib/scatterlist: Add SG_CHAIN and SG_END macros for LSB encodings") Cc: Anshuman Khandual Cc: Jens Axboe Signed-off-by: Arnd Bergmann --- drivers/staging/rts5208/rtsx_chip.h | 12 ++++++------ drivers/staging/rts5208/rtsx_transport.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) -- 2.9.0 Reviewed-by: Andy Shevchenko diff --git a/drivers/staging/rts5208/rtsx_chip.h b/drivers/staging/rts5208/rtsx_chip.h index 4f6e3c1c4621..8a8cd5d3cf7e 100644 --- a/drivers/staging/rts5208/rtsx_chip.h +++ b/drivers/staging/rts5208/rtsx_chip.h @@ -339,13 +339,13 @@ struct sense_data_t { #define CHK_BIT(data, idx) ((data) & (1 << (idx))) /* SG descriptor */ -#define SG_INT 0x04 -#define SG_END 0x02 -#define SG_VALID 0x01 +#define RTSX_SG_INT 0x04 +#define RTSX_SG_END 0x02 +#define RTSX_SG_VALID 0x01 -#define SG_NO_OP 0x00 -#define SG_TRANS_DATA (0x02 << 4) -#define SG_LINK_DESC (0x03 << 4) +#define RTSX_SG_NO_OP 0x00 +#define RTSX_SG_TRANS_DATA (0x02 << 4) +#define RTSX_SG_LINK_DESC (0x03 << 4) struct rtsx_chip; diff --git a/drivers/staging/rts5208/rtsx_transport.c b/drivers/staging/rts5208/rtsx_transport.c index 8b57e17ee6d3..716cce2bd7f0 100644 --- a/drivers/staging/rts5208/rtsx_transport.c +++ b/drivers/staging/rts5208/rtsx_transport.c @@ -308,7 +308,7 @@ static inline void rtsx_add_sg_tbl( do { if (len > 0x80000) { temp_len = 0x80000; - temp_opt = option & (~SG_END); + temp_opt = option & (~RTSX_SG_END); } else { temp_len = len; temp_opt = option; @@ -407,9 +407,9 @@ static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card, *index = *index + 1; } if ((i == (sg_cnt - 1)) || !resid) - option = SG_VALID | SG_END | SG_TRANS_DATA; + option = RTSX_SG_VALID | RTSX_SG_END | RTSX_SG_TRANS_DATA; else - option = SG_VALID | SG_TRANS_DATA; + option = RTSX_SG_VALID | RTSX_SG_TRANS_DATA; rtsx_add_sg_tbl(chip, (u32)addr, (u32)len, option); @@ -555,9 +555,9 @@ static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card, (unsigned int)addr, len); if (j == (sg_cnt - 1)) - option = SG_VALID | SG_END | SG_TRANS_DATA; + option = RTSX_SG_VALID | RTSX_SG_END | RTSX_SG_TRANS_DATA; else - option = SG_VALID | SG_TRANS_DATA; + option = RTSX_SG_VALID | RTSX_SG_TRANS_DATA; rtsx_add_sg_tbl(chip, (u32)addr, (u32)len, option);