From: Kevin Hao <haokexin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org, linux-fbdev@vger.kernel.org
Cc: Kevin Hao <haokexin@gmail.com>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Subject: [PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF
Date: Sat, 31 Jan 2015 13:47:35 +0000 [thread overview]
Message-ID: <1422712065-9403-6-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 depend on PPC_OF option any more. This is
a preparation for killing PPC_OF.
Signed-off-by: Kevin Hao <haokexin@gmail.com>
---
drivers/video/fbdev/imsttfb.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
index aae10ce74f14..91a80bb8f988 100644
--- a/drivers/video/fbdev/imsttfb.c
+++ b/drivers/video/fbdev/imsttfb.c
@@ -1470,7 +1470,6 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
unsigned long addr, size;
struct imstt_par *par;
struct fb_info *info;
-#ifdef CONFIG_PPC_OF
struct device_node *dp;
dp = pci_device_to_OF_node(pdev);
@@ -1478,7 +1477,6 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
else
printk(KERN_ERR "imsttfb: no OF node for pci device\n");
-#endif /* CONFIG_PPC_OF */
info = framebuffer_alloc(sizeof(struct imstt_par), &pdev->dev);
@@ -1501,11 +1499,9 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
switch (pdev->device) {
case PCI_DEVICE_ID_IMS_TT128: /* IMS,tt128mbA */
par->ramdac = IBM;
-#ifdef CONFIG_PPC_OF
if (dp && ((strcmp(dp->name, "IMS,tt128mb8") = 0) ||
(strcmp(dp->name, "IMS,tt128mb8A") = 0)))
par->ramdac = TVP;
-#endif /* CONFIG_PPC_OF */
break;
case PCI_DEVICE_ID_IMS_TT3D: /* IMS,tt3d */
par->ramdac = TVP;
--
1.9.3
next prev parent reply other threads:[~2015-01-31 13:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1422712065-9403-1-git-send-email-haokexin@gmail.com>
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 ` Kevin Hao [this message]
2015-02-01 2:44 ` [PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF 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
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-6-git-send-email-haokexin@gmail.com \
--to=haokexin@gmail.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=plagnioj@jcrosoft.com \
--cc=tomi.valkeinen@ti.com \
/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).