From: Kevin Hao <haokexin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org, linux-ide@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>, Kevin Hao <haokexin@gmail.com>
Subject: [PATCH 02/15] sata_svw: remove the dependency on PPC_OF
Date: Sat, 31 Jan 2015 21:47:32 +0800 [thread overview]
Message-ID: <1422712065-9403-3-git-send-email-haokexin@gmail.com> (raw)
In-Reply-To: <1422712065-9403-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>
---
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
next prev parent reply other threads:[~2015-01-31 13:48 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-31 13:47 [PATCH 00/15] powerpc: kill PPC_OF Kevin Hao
2015-01-31 13:47 ` [PATCH 01/15] PCI: introduce pci_device_to_OF_node() for !CONFIG_OF Kevin Hao
2015-02-02 2:28 ` Michael Ellerman
2015-02-02 15:47 ` Bjorn Helgaas
2015-02-03 0:25 ` Michael Ellerman
2015-02-03 1:37 ` [PATCH v2 01/15] PCI: Add pci_device_to_OF_node() stub " Kevin Hao
2015-02-03 15:31 ` Bjorn Helgaas
2015-02-03 15:29 ` [PATCH 01/15] PCI: introduce pci_device_to_OF_node() " Bjorn Helgaas
2015-02-03 1:02 ` Kevin Hao
2015-01-31 13:47 ` Kevin Hao [this message]
2015-01-31 15:43 ` [PATCH 02/15] sata_svw: remove the dependency on PPC_OF Tejun Heo
2015-01-31 13:47 ` [PATCH 03/15] fbdev: aty128fb: replace PPC_OF with PPC Kevin Hao
2015-02-27 0:11 ` Benjamin Herrenschmidt
2015-02-27 1:05 ` Kevin Hao
2015-02-27 2:05 ` Benjamin Herrenschmidt
2015-03-10 12:23 ` Tomi Valkeinen
2015-03-11 4:38 ` Kevin Hao
2015-03-11 7:51 ` Tomi Valkeinen
2015-01-31 13:47 ` [PATCH 04/15] fbdev: radeon: " Kevin Hao
2015-01-31 13:47 ` [PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF Kevin Hao
2015-02-01 2:44 ` Stephen Rothwell
2015-02-01 5:51 ` Kevin Hao
2015-02-03 2:20 ` Kevin Hao
2015-02-03 2:34 ` Stephen Rothwell
2015-02-03 2:34 ` Stephen Rothwell
2015-01-31 13:47 ` [PATCH 06/15] fbdev: nvidia: " Kevin Hao
2015-01-31 13:47 ` [PATCH 07/15] fbdev: riva: " Kevin Hao
2015-01-31 13:47 ` [PATCH 08/15] fbdev: remove the unnecessary includes of ppc specific header files Kevin Hao
2015-01-31 13:47 ` [PATCH 09/15] fbdev: kconfig: replace PPC_OF with PPC Kevin Hao
2015-01-31 13:47 ` [PATCH 10/15] gpio: " Kevin Hao
2015-02-04 10:07 ` Linus Walleij
2015-01-31 13:47 ` [PATCH 11/15] mmc: " Kevin Hao
2015-01-31 13:47 ` [PATCH 12/15] mtd: " Kevin Hao
2015-02-06 4:08 ` Brian Norris
2015-01-31 13:47 ` [PATCH 13/15] tty: kconfig: remove the superfluous dependency on PPC_OF Kevin Hao
2015-01-31 13:47 ` [PATCH 14/15] usb: kconfig: replace PPC_OF with PPC Kevin Hao
2015-01-31 13:47 ` [PATCH 15/15] powerpc: kill PPC_OF Kevin Hao
2015-02-02 2:25 ` [PATCH 00/15] " Michael Ellerman
2015-02-02 2:42 ` 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=1422712065-9403-3-git-send-email-haokexin@gmail.com \
--to=haokexin@gmail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=tj@kernel.org \
/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).