From patchwork Sat Jan 31 13:47:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 435130 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 ED0EC1402D9 for ; Sun, 1 Feb 2015 00:50:20 +1100 (AEDT) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id C9F911A136C for ; Sun, 1 Feb 2015 00:50:20 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-yk0-x22f.google.com (mail-yk0-x22f.google.com [IPv6:2607:f8b0:4002:c07::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 7F5921A0F71 for ; Sun, 1 Feb 2015 00:48:18 +1100 (AEDT) Received: by mail-yk0-f175.google.com with SMTP id 9so19103696ykp.6 for ; Sat, 31 Jan 2015 05:48:16 -0800 (PST) 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=VYpYbgSqI3uJRQv7pGtl8hlylSWfHIXgmcdMUMD9eFw=; b=F+lubdjRYoOaZHYl6PWtWLm3z9AGc3lSRVY0+Q62hy1LHrxWUpy5CXaNtrL2YEOoYw GcIaNN36g/Dcw5jLuQQuv+VENpAvC4fRUP7i1yT/jue7JDNlhl135Z8nNELNRYDDerp6 nXhcAUKp2Q/8H9nisymD5zy3sOYC7NuYEej0n2fQkxpw3k7vVKAm6cgGpdgA5c2biomC rEQyFLmPJ0M8wGM+PUySBkTJI+k/FZChay3P0ALKtrDPWJI9cSrObeTE1dENvCqjc1Lj SmLKNfBSum95+L0TWslYDLR/qcTSnbEI8/HohSgW3akn54eK+h7zAqBzhUX/mbbTw7xL nq3g== X-Received: by 10.236.4.72 with SMTP id 48mr5390419yhi.10.1422712096257; Sat, 31 Jan 2015 05:48:16 -0800 (PST) Received: from pek-khao-d1.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id z23sm8423995yhz.35.2015.01.31.05.48.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Jan 2015 05:48:15 -0800 (PST) From: Kevin Hao To: linuxppc-dev@lists.ozlabs.org, linux-ide@vger.kernel.org Subject: [PATCH 02/15] sata_svw: remove the dependency on PPC_OF Date: Sat, 31 Jan 2015 21:47:32 +0800 Message-Id: <1422712065-9403-3-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1422712065-9403-1-git-send-email-haokexin@gmail.com> References: <1422712065-9403-1-git-send-email-haokexin@gmail.com> Cc: Tejun Heo , Kevin Hao 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 --- 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 };