linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Hao <haokexin@gmail.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v2 01/11] sata_svw: remove the dependency on PPC_OF
Date: Thu, 26 Feb 2015 20:08:13 +0800	[thread overview]
Message-ID: <1424952503-8247-2-git-send-email-haokexin@gmail.com> (raw)
In-Reply-To: <1424952503-8247-1-git-send-email-haokexin@gmail.com>

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 <haokexin@gmail.com>
Acked-by: Tejun Heo <tj@kernel.org>
---
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 <scsi/scsi_cmnd.h>
 #include <scsi/scsi.h>
 #include <linux/libata.h>
-
-#ifdef CONFIG_PPC_OF
-#include <asm/prom.h>
-#include <asm/pci-bridge.h>
-#endif /* CONFIG_PPC_OF */
+#include <linux/of.h>
 
 #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
 };
 
 
-- 
1.9.3

  reply	other threads:[~2015-02-26 12:09 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-26 12:08 [PATCH v2 00/11] powerpc: kill PPC_OF Kevin Hao
2015-02-26 12:08 ` Kevin Hao [this message]
2015-02-26 12:08 ` [PATCH v2 02/11] fbdev: aty128fb: replace PPC_OF with PPC Kevin Hao
2015-02-26 12:08 ` [PATCH v2 03/11] fbdev: radeon: " Kevin Hao
2015-02-26 12:08 ` [PATCH v2 04/11] fbdev: imsttfb: remove the dependency on PPC_OF Kevin Hao
2015-02-26 12:08 ` [PATCH v2 05/11] fbdev: nvidia: " Kevin Hao
2015-02-26 12:08 ` [PATCH v2 06/11] fbdev: riva: " Kevin Hao
2015-02-26 12:08 ` [PATCH v2 07/11] fbdev: remove the unnecessary includes of ppc specific header files Kevin Hao
2015-02-26 12:08 ` [PATCH v2 08/11] fbdev: kconfig: replace PPC_OF with PPC Kevin Hao
2015-02-26 12:08 ` [PATCH v2 09/11] mmc: " Kevin Hao
2015-03-05 13:50   ` Ulf Hansson
2015-02-26 12:08 ` [PATCH v2 10/11] tty: kconfig: remove the superfluous dependency on PPC_OF Kevin Hao
2015-03-07  2:32   ` Greg Kroah-Hartman
2015-02-26 12:08 ` [PATCH v2 11/11] powerpc: kill PPC_OF Kevin Hao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424952503-8247-2-git-send-email-haokexin@gmail.com \
    --to=haokexin@gmail.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).