{"id":806266,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806266/?format=json","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.0/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/"},"msgid":"<20170827161032.22772-2-hch@lst.de>","date":"2017-08-27T16:10:21","name":"[01/12] floppy: consolidate the dummy fd_cacheflush definition","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"3a2582fb66e686e4338b7a39290f160bcad81288","submitter":{"id":82,"url":"http://patchwork.ozlabs.org/api/1.0/people/82/?format=json","name":"Christoph Hellwig","email":"hch@lst.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20170827161032.22772-2-hch@lst.de/mbox/","series":[{"id":29,"url":"http://patchwork.ozlabs.org/api/1.0/series/29/?format=json","date":"2017-08-27T16:10:24","name":"[01/12] floppy: consolidate the dummy fd_cacheflush definition","version":1,"mbox":"http://patchwork.ozlabs.org/series/29/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806266/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xgKnl1GYqz9s8V\n\tfor ;\n\tMon, 28 Aug 2017 02:18:19 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xgKnk73NZzDq88\n\tfor ;\n\tMon, 28 Aug 2017 02:18:18 +1000 (AEST)","from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xgKdB10KyzDqfw\n\tfor ;\n\tMon, 28 Aug 2017 02:10:51 +1000 (AEST)","from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost)\n\tby bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat\n\tLinux)) id 1dm08z-0006r4-Uy; Sun, 27 Aug 2017 16:10:38 +0000"],"Authentication-Results":["ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=infradead.org header.i=@infradead.org\n\theader.b=\"i80rTXQ7\"; dkim-atps=neutral","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=infradead.org header.i=@infradead.org\n\theader.b=\"i80rTXQ7\"; dkim-atps=neutral","lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=infradead.org header.i=@infradead.org\n\theader.b=\"i80rTXQ7\"; dkim-atps=neutral"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=bombadil.20170209;\n\th=References:In-Reply-To:Message-Id:\n\tDate:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type:\n\tContent-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:\n\tResent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:\n\tList-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;\n\tbh=1gkwFIEl+mGuY2quRb1Mw3EgjPTrVWuIul2QAg4C4yU=;\n\tb=i80rTXQ7nCQGgutfWmFYlb6mI\n\tUa4JGzBuzQzipyRh23A7HlTWESKkLxCVEwkaOeO/qbAZuev3M/wrszDfZaaONR3swFz50YYcXseHT\n\tTom6BxytZRDNvLkeDFb7Xc5x2lSsTdvPEh4kGoQiRFEQOs5tkXZg/vrtEzlqbO+75AkV9ovx+vwCW\n\tZiGp4fXo0G9ddtzxtd32pr/RzAfr6QECzi1YlFvgLKSX4Wp44kJ06m4mC7YZLk6xF7uxpksPI6iwQ\n\tAFPvB/21q45e9ZXOieTd3vtPYcWPi6UNy4Y2eK9/EnWv0wAiVdNjK66/rpKDfsry+4ilHBF0QM0cL\n\t9mvTjOVRg==;","From":"Christoph Hellwig ","To":"iommu@lists.linux-foundation.org","Subject":"[PATCH 01/12] floppy: consolidate the dummy fd_cacheflush definition","Date":"Sun, 27 Aug 2017 18:10:21 +0200","Message-Id":"<20170827161032.22772-2-hch@lst.de>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170827161032.22772-1-hch@lst.de>","References":"<20170827161032.22772-1-hch@lst.de>","X-SRS-Rewrite":"SMTP reverse-path rewritten from by\n\tbombadil.infradead.org. See http://www.infradead.org/rpr.html","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Chris Zankel , Michal Simek ,\n\tlinux-ia64@vger.kernel.org, linux-mips@linux-mips.org,\n\tlinux-sh@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,\n\tlinux-xtensa@linux-xtensa.org, x86@kernel.org,\n\tlinux-kernel@vger.kernel.org, \n\tDavid Howells , Max Filippov ,\n\tGuan Xuetao , Robin Murphy ,\n\tMarek Szyprowski ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"Only mips defines this helper, so remove all the other arch definitions.\n\nSigned-off-by: Christoph Hellwig \n---\n arch/alpha/include/asm/floppy.h | 2 --\n arch/powerpc/include/asm/floppy.h | 2 --\n arch/sparc/include/asm/floppy_32.h | 1 -\n arch/sparc/include/asm/floppy_64.h | 1 -\n drivers/block/floppy.c | 4 ++++\n 5 files changed, 4 insertions(+), 6 deletions(-)","diff":"diff --git a/arch/alpha/include/asm/floppy.h b/arch/alpha/include/asm/floppy.h\nindex bae97eb19d26..942924756cf2 100644\n--- a/arch/alpha/include/asm/floppy.h\n+++ b/arch/alpha/include/asm/floppy.h\n@@ -24,7 +24,6 @@\n #define fd_set_dma_count(count) set_dma_count(FLOPPY_DMA,count)\n #define fd_enable_irq() enable_irq(FLOPPY_IRQ)\n #define fd_disable_irq() disable_irq(FLOPPY_IRQ)\n-#define fd_cacheflush(addr,size) /* nothing */\n #define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt,\\\n \t\t\t\t\t 0, \"floppy\", NULL)\n #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL)\n@@ -62,7 +61,6 @@ alpha_fd_dma_setup(char *addr, unsigned long size, int mode, int io)\n \tprev_dir = dir;\n \n \tfd_clear_dma_ff();\n-\tfd_cacheflush(addr, size);\n \tfd_set_dma_mode(mode);\n \tset_dma_addr(FLOPPY_DMA, bus_addr);\n \tfd_set_dma_count(size);\ndiff --git a/arch/powerpc/include/asm/floppy.h b/arch/powerpc/include/asm/floppy.h\nindex 936a904ae78c..167c44b58848 100644\n--- a/arch/powerpc/include/asm/floppy.h\n+++ b/arch/powerpc/include/asm/floppy.h\n@@ -25,7 +25,6 @@\n #define fd_get_dma_residue() fd_ops->_get_dma_residue(FLOPPY_DMA)\n #define fd_enable_irq() enable_irq(FLOPPY_IRQ)\n #define fd_disable_irq() disable_irq(FLOPPY_IRQ)\n-#define fd_cacheflush(addr,size) /* nothing */\n #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL);\n \n #include \n@@ -152,7 +151,6 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)\n \tprev_dir = dir;\n \n \tfd_clear_dma_ff();\n-\tfd_cacheflush(addr, size);\n \tfd_set_dma_mode(mode);\n \tset_dma_addr(FLOPPY_DMA, bus_addr);\n \tfd_set_dma_count(size);\ndiff --git a/arch/sparc/include/asm/floppy_32.h b/arch/sparc/include/asm/floppy_32.h\nindex 071b83e52f15..dab58525229e 100644\n--- a/arch/sparc/include/asm/floppy_32.h\n+++ b/arch/sparc/include/asm/floppy_32.h\n@@ -70,7 +70,6 @@ static struct sun_floppy_ops sun_fdops;\n #define fd_set_dma_count(count) sun_fd_set_dma_count(count)\n #define fd_enable_irq() /* nothing... */\n #define fd_disable_irq() /* nothing... */\n-#define fd_cacheflush(addr, size) /* nothing... */\n #define fd_request_irq() sun_fd_request_irq()\n #define fd_free_irq() /* nothing... */\n #if 0 /* P3: added by Alain, these cause a MMU corruption. 19960524 XXX */\ndiff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h\nindex 625756406a7e..a1db35a22c99 100644\n--- a/arch/sparc/include/asm/floppy_64.h\n+++ b/arch/sparc/include/asm/floppy_64.h\n@@ -72,7 +72,6 @@ static struct sun_floppy_ops sun_fdops;\n #define fd_set_dma_addr(addr) sun_fdops.fd_set_dma_addr(addr)\n #define fd_set_dma_count(count) sun_fdops.fd_set_dma_count(count)\n #define get_dma_residue(x) sun_fdops.get_dma_residue()\n-#define fd_cacheflush(addr, size) /* nothing... */\n #define fd_request_irq() sun_fdops.fd_request_irq()\n #define fd_free_irq() sun_fdops.fd_free_irq()\n #define fd_eject(drive) sun_fdops.fd_eject(drive)\ndiff --git a/drivers/block/floppy.c b/drivers/block/floppy.c\nindex 9c00f29e40c1..b1d896f9a227 100644\n--- a/drivers/block/floppy.c\n+++ b/drivers/block/floppy.c\n@@ -275,6 +275,10 @@ static int set_next_request(void);\n #define fd_dma_mem_alloc(size) __get_dma_pages(GFP_KERNEL, get_order(size))\n #endif\n \n+#ifndef fd_cacheflush\n+#define fd_cacheflush(addr, size) /* nothing... */\n+#endif\n+\n static inline void fallback_on_nodma_alloc(char **addr, size_t l)\n {\n #ifdef FLOPPY_CAN_FALLBACK_ON_NODMA\n","prefixes":["01/12"]}