From patchwork Thu Feb 26 12:08:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 443889 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 B673A1400EA for ; Thu, 26 Feb 2015 23:12:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=L6mieDkk; 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 6B2081A00EE for ; Thu, 26 Feb 2015 23:12:20 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=L6mieDkk; 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-x22d.google.com (mail-yh0-x22d.google.com [IPv6:2607:f8b0:4002:c01::22d]) (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 1CFF91A002B for ; Thu, 26 Feb 2015 23:09:18 +1100 (AEDT) Received: by yhl29 with SMTP id 29so4203690yhl.0 for ; Thu, 26 Feb 2015 04:09: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=e8F78SKsnzNSDPfZqOo/hq4LfJz4qETndTKbVUjpERA=; b=L6mieDkkfNyPn8W5tKWyhV4YG+wIEEkphhGDskfZ+uIhI9zY8PB57hrXMu2yYownfa Nhs4ud8OlR8dqLPYNx2yLjKuGKdCvWMX2wMM4uVkHf/Zjy40S5GxfMpCZGzhoYtZgx/o u/YEAYS4O00cGZ2JkFNcfkm00TUTpoydPxFk32rfWfZnut/1FXXvAz6RLg5pXq4FOspL eQr2egRGkEZo1iaENWHwF9JESyq1gXEyJCnV827/vjCnAS5njkyo2VQ7Cu7S610QDCiK XdmW92o0gd6Ar7tJgz+ZBAs81EdBFgLpks+FaJBcvo0TjgsJD678/5v4eTGXqAx+6ozZ lrAA== X-Received: by 10.170.35.145 with SMTP id 139mr7050720ykd.59.1424952555966; Thu, 26 Feb 2015 04:09:15 -0800 (PST) Received: from pek-khao-d1.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id m5sm402805yhb.24.2015.02.26.04.09.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2015 04:09:14 -0800 (PST) From: Kevin Hao To: Michael Ellerman Subject: [PATCH v2 01/11] sata_svw: remove the dependency on PPC_OF Date: Thu, 26 Feb 2015 20:08:13 +0800 Message-Id: <1424952503-8247-2-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1424952503-8247-1-git-send-email-haokexin@gmail.com> References: <1424952503-8247-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 --- v2: Add the ack from 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 };