From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: [PATCH 2/2] mn10300: remove Date: Mon, 19 Jan 2009 19:34:02 +0100 Message-ID: <200901191934.02370.bzolnier@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org To: linux-ide@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Howells List-Id: linux-ide@vger.kernel.org RnJvbTogQmFydGxvbWllaiBab2xuaWVya2lld2ljeiA8YnpvbG5pZXJAZ21haWwuY29tPgpTdWJq ZWN0OiBbUEFUQ0hdIG1uMTAzMDA6IHJlbW92ZSA8YXNtL2lkZS5oPgoKKiBSZW1vdmUgc3VwZXJm bHVvdXMgPGFzbS9pbnRjdGwtcmVncy5oPiBpbmNsdWRlLgoKKiBSZW1vdmUgbm8gbG9uZ2VyIHVz ZWQgU1VQUE9SVF9TTE9XX0RBVEFfUE9SVFMgZGVmaW5lLgoKKiBNb3ZlIGRlZmluaW5nIFNVUFBP UlRfVkxCX1NZTkMgdG8gPGxpbnV4L2lkZS5oPi4KCiogVXNlIF9faWRlX21tXyooKSBtYWNyb3Mg ZnJvbSA8YXNtLWdlbmVyaWMvaWRlX2lvcHMuaD4KICAoTU4xMDMwMCB1c2VzIG9ubHkgbWVtb3J5 LW1hcHBlZCBJL08pLgoKKiBSZW1vdmUgPGFzbS9pZGUuaD4uCgpXaGlsZSBhdCBpdDoKCiogUmVt b3ZlIHN1cGVyZmx1b3VzIFNQQVJDNjQgI2lmZGVmIGZyb20gPGxpbnV4L2lkZS5oPi4KCkNjOiBE YXZpZCBIb3dlbGxzIDxkaG93ZWxsc0ByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBCYXJ0bG9t aWVqIFpvbG5pZXJraWV3aWN6IDxiem9sbmllckBnbWFpbC5jb20+Ci0tLQogaW5jbHVkZS9hc20t bW4xMDMwMC9pZGUuaCB8ICAgMzkgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiBpbmNsdWRlL2xpbnV4L2lkZS5oICAgICAgIHwgICAgNSArKy0tLQogMiBmaWxlcyBjaGFu Z2VkLCAyIGluc2VydGlvbnMoKyksIDQyIGRlbGV0aW9ucygtKQoKSW5kZXg6IGIvaW5jbHVkZS9h c20tbW4xMDMwMC9pZGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBhL2luY2x1ZGUvYXNtLW1uMTAzMDAvaWRl LmgKKysrIC9kZXYvbnVsbApAQCAtMSwzOSArMCwwIEBACi0vKiBNTjEwMzAwIEFyY2gtc3BlY2lm aWMgSURFIGNvZGUKLSAqCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDcgUmVkIEhhdCwgSW5jLiBBbGwg UmlnaHRzIFJlc2VydmVkLgotICogV3JpdHRlbiBieSBEYXZpZCBIb3dlbGxzIChkaG93ZWxsc0By ZWRoYXQuY29tKQotICogLSBEZXJpdmVkIGZyb20gaW5jbHVkZS9hc20taTM4Ni9pZGUuaAotICoK LSAqIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBp dCBhbmQvb3IKLSAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFs IFB1YmxpYyBMaWNlbmNlCi0gKiBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91 bmRhdGlvbjsgZWl0aGVyIHZlcnNpb24KLSAqIDIgb2YgdGhlIExpY2VuY2UsIG9yIChhdCB5b3Vy IG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCi0gKi8KLQotI2lmbmRlZiBfQVNNX0lERV9ICi0j ZGVmaW5lIF9BU01fSURFX0gKLQotI2lmZGVmIF9fS0VSTkVMX18KLQotI2luY2x1ZGUgPGFzbS9p bnRjdGwtcmVncy5oPgotCi0jdW5kZWYgU1VQUE9SVF9TTE9XX0RBVEFfUE9SVFMKLSNkZWZpbmUg U1VQUE9SVF9TTE9XX0RBVEFfUE9SVFMgMAotCi0jdW5kZWYgU1VQUE9SVF9WTEJfU1lOQwotI2Rl ZmluZSBTVVBQT1JUX1ZMQl9TWU5DIDAKLQotLyoKLSAqIHNvbWUgYml0cyBuZWVkZWQgZm9yIHBh cnRzIG9mIHRoZSBJREUgc3Vic3lzdGVtIHRvIGNvbXBpbGUKLSAqLwotI2RlZmluZSBfX2lkZV9t bV9pbnN3KHBvcnQsIGFkZHIsIG4pIFwKLQlpbnN3KCh1bnNpZ25lZCBsb25nKSAocG9ydCksIChh ZGRyKSwgKG4pKQotI2RlZmluZSBfX2lkZV9tbV9pbnNsKHBvcnQsIGFkZHIsIG4pIFwKLQlpbnNs KCh1bnNpZ25lZCBsb25nKSAocG9ydCksIChhZGRyKSwgKG4pKQotI2RlZmluZSBfX2lkZV9tbV9v dXRzdyhwb3J0LCBhZGRyLCBuKSBcCi0Jb3V0c3coKHVuc2lnbmVkIGxvbmcpIChwb3J0KSwgKGFk ZHIpLCAobikpCi0jZGVmaW5lIF9faWRlX21tX291dHNsKHBvcnQsIGFkZHIsIG4pIFwKLQlvdXRz bCgodW5zaWduZWQgbG9uZykgKHBvcnQpLCAoYWRkciksIChuKSkKLQotI2VuZGlmIC8qIF9fS0VS TkVMX18gKi8KLSNlbmRpZiAvKiBfQVNNX0lERV9IICovCkluZGV4OiBiL2luY2x1ZGUvbGludXgv aWRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gYS9pbmNsdWRlL2xpbnV4L2lkZS5oCisrKyBiL2luY2x1ZGUv bGludXgvaWRlLmgKQEAgLTI2LDcgKzI2LDcgQEAKICNpbmNsdWRlIDxhc20vaW8uaD4KICNpbmNs dWRlIDxhc20vbXV0ZXguaD4KIAotI2lmIGRlZmluZWQoQ09ORklHX0NSSVMpIHx8IGRlZmluZWQo Q09ORklHX0ZSVikKKyNpZiBkZWZpbmVkKENPTkZJR19DUklTKSB8fCBkZWZpbmVkKENPTkZJR19G UlYpIHx8IGRlZmluZWQoQ09ORklHX01OMTAzMDApCiAjIGRlZmluZSBTVVBQT1JUX1ZMQl9TWU5D IDAKICNlbHNlCiAjIGRlZmluZSBTVVBQT1JUX1ZMQl9TWU5DIDEKQEAgLTE5NCw4ICsxOTQsNyBA QCBzdGF0aWMgaW5saW5lIHZvaWQgaWRlX3N0ZF9pbml0X3BvcnRzKGh3CiB9CiAKICNpZiBkZWZp bmVkKENPTkZJR19BUk0pIHx8IGRlZmluZWQoQ09ORklHX002OEspIHx8IGRlZmluZWQoQ09ORklH X01JUFMpIHx8IFwKLSAgICBkZWZpbmVkKENPTkZJR19NTjEwMzAwKSB8fCBkZWZpbmVkKENPTkZJ R19QQVJJU0MpIFwKLSAgICB8fCBkZWZpbmVkKENPTkZJR19QUEMpIHx8IGRlZmluZWQoQ09ORklH X1NQQVJDKSB8fCBkZWZpbmVkKENPTkZJR19TUEFSQzY0KQorICAgIGRlZmluZWQoQ09ORklHX1BB UklTQykgfHwgZGVmaW5lZChDT05GSUdfUFBDKSB8fCBkZWZpbmVkKENPTkZJR19TUEFSQykKICNp bmNsdWRlIDxhc20vaWRlLmg+CiAjZWxzZQogI2luY2x1ZGUgPGFzbS1nZW5lcmljL2lkZV9pb3Bz Lmg+CgAK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757393AbZASSe7 (ORCPT ); Mon, 19 Jan 2009 13:34:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752253AbZASSef (ORCPT ); Mon, 19 Jan 2009 13:34:35 -0500 Received: from mail-bw0-f21.google.com ([209.85.218.21]:56221 "EHLO mail-bw0-f21.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753137AbZASSed (ORCPT ); Mon, 19 Jan 2009 13:34:33 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; b=CiJU8ww3u1q1rDFMCH+2YCpdgcjMSc6jd+Sm/W/SSt6QBSRw541eTuNYN/t9uwPt2l y0AYoRs/JqrgxhSxf6ITKaKnVHP5Qwt7lUWoYfdcjayxvdvCdejyenTtE3S1TOLUNT4i 7eWTinXlBKlHirqTyRTu6zDU63KUperAC+C1k= From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Subject: [PATCH 2/2] mn10300: remove Date: Mon, 19 Jan 2009 19:34:02 +0100 User-Agent: KMail/1.10.3 (Linux/2.6.29-rc1-next-20090116; KDE/4.1.3; i686; ; ) Cc: linux-kernel@vger.kernel.org, David Howells MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Message-Id: <200901191934.02370.bzolnier@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id n0JIZJwM020017 From: Bartlomiej Zolnierkiewicz Subject: [PATCH] mn10300: remove * Remove superfluous include. * Remove no longer used SUPPORT_SLOW_DATA_PORTS define. * Move defining SUPPORT_VLB_SYNC to . * Use __ide_mm_*() macros from (MN10300 uses only memory-mapped I/O). * Remove . While at it: * Remove superfluous SPARC64 #ifdef from . Cc: David Howells Signed-off-by: Bartlomiej Zolnierkiewicz --- include/asm-mn10300/ide.h | 39 --------------------------------------- include/linux/ide.h | 5 ++--- 2 files changed, 2 insertions(+), 42 deletions(-) Index: b/include/asm-mn10300/ide.h===================================================================--- a/include/asm-mn10300/ide.h+++ /dev/null@@ -1,39 +0,0 @@-/* MN10300 Arch-specific IDE code- *- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.- * Written by David Howells (dhowells@redhat.com)- * - Derived from include/asm-i386/ide.h- *- * This program is free software; you can redistribute it and/or- * modify it under the terms of the GNU General Public Licence- * as published by the Free Software Foundation; either version- * 2 of the Licence, or (at your option) any later version.- */--#ifndef _ASM_IDE_H-#define _ASM_IDE_H--#ifdef __KERNEL__--#include --#undef SUPPORT_SLOW_DATA_PORTS-#define SUPPORT_SLOW_DATA_PORTS 0--#undef SUPPORT_VLB_SYNC-#define SUPPORT_VLB_SYNC 0--/*- * some bits needed for parts of the IDE subsystem to compile- */-#define __ide_mm_insw(port, addr, n) \- insw((unsigned long) (port), (addr), (n))-#define __ide_mm_insl(port, addr, n) \- insl((unsigned long) (port), (addr), (n))-#define __ide_mm_outsw(port, addr, n) \- outsw((unsigned long) (port), (addr), (n))-#define __ide_mm_outsl(port, addr, n) \- outsl((unsigned long) (port), (addr), (n))--#endif /* __KERNEL__ */-#endif /* _ASM_IDE_H */Index: b/include/linux/ide.h===================================================================--- a/include/linux/ide.h+++ b/include/linux/ide.h@@ -26,7 +26,7 @@ #include #include -#if defined(CONFIG_CRIS) || defined(CONFIG_FRV)+#if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300) # define SUPPORT_VLB_SYNC 0 #else # define SUPPORT_VLB_SYNC 1@@ -194,8 +194,7 @@ static inline void ide_std_init_ports(hw } #if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \- defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \- || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)+ defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) #include #else #include {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I