From patchwork Thu Mar 12 12:32:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 449442 X-Patchwork-Delegate: michael@ellerman.id.au Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8B5201400DE for ; Thu, 12 Mar 2015 23:36:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=dubuJqxJ; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 5D1441A07C2 for ; Thu, 12 Mar 2015 23:36:13 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=dubuJqxJ; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-yh0-x233.google.com (mail-yh0-x233.google.com [IPv6:2607:f8b0:4002:c01::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id EC07C1A019A for ; Thu, 12 Mar 2015 23:33:09 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass reason="2048-bit key; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=dubuJqxJ; dkim-adsp=pass; dkim-atps=neutral Received: by yhai57 with SMTP id i57so8028268yha.6 for ; Thu, 12 Mar 2015 05:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jbi58gayHU5cIyY6wOH890F1zwxIJdmwZP9W03qops4=; b=dubuJqxJQNk+bLLlrpcPvIxuGes2RWWnTW5mZsQ99/3hCc+pHm3E0o0lZjjSIkPCWE es2kbNMJvMQt7frukiB4lVqsf04OBStFWo7dgz3bFnWMb76Luiaqxbt6IfiPcEbWStc5 W9ov+hR1MDjTPSnDM1I5LviNCQF2Db7biMtCV05Sm/RJ7dJr7qWhQZMe71GCI5v1YTo0 g+ROPPnHOXqJtOZgkA6c1ru/u/fBJpJKNZavgpYOzenIzuUnnOXdRFLnBBLmzja+tfVe zWbyojrQkxSt3mBhUlY6ExjcexWc3DnLFNS+TPRD1yve/BBY+r08JOPlGYRl17RG6meb 6HQw== X-Received: by 10.236.140.163 with SMTP id e23mr41381525yhj.155.1426163587725; Thu, 12 Mar 2015 05:33:07 -0700 (PDT) Received: from pek-khao-d1.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id a74sm5317686yhq.31.2015.03.12.05.33.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Mar 2015 05:33:06 -0700 (PDT) From: Kevin Hao To: Michael Ellerman Subject: [PATCH v3 1/9] sata_svw: remove the dependency on PPC_OF Date: Thu, 12 Mar 2015 20:32:42 +0800 Message-Id: <1426163570-10281-2-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1426163570-10281-1-git-send-email-haokexin@gmail.com> References: <1426163570-10281-1-git-send-email-haokexin@gmail.com> Cc: linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The OF functionality has moved to a common place and be used by many archs. So we don't need to include the ppc arch specific header files and depend on PPC_OF option any more. This is a preparation for killing PPC_OF. Signed-off-by: Kevin Hao Acked-by: Tejun Heo Acked-by: Benjamin Herrenschmidt --- drivers/ata/sata_svw.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index c630fa812624..4c06f6281d74 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c @@ -47,11 +47,7 @@ #include #include #include - -#ifdef CONFIG_PPC_OF -#include -#include -#endif /* CONFIG_PPC_OF */ +#include #define DRV_NAME "sata_svw" #define DRV_VERSION "2.3" @@ -320,7 +316,6 @@ static u8 k2_stat_check_status(struct ata_port *ap) return readl(ap->ioaddr.status_addr); } -#ifdef CONFIG_PPC_OF static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost) { struct ata_port *ap; @@ -350,14 +345,10 @@ static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost) } return 0; } -#endif /* CONFIG_PPC_OF */ - static struct scsi_host_template k2_sata_sht = { ATA_BMDMA_SHT(DRV_NAME), -#ifdef CONFIG_PPC_OF .show_info = k2_sata_show_info, -#endif };