From: Kevin Hao <haokexin@gmail.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
linux-fbdev@vger.kernel.org,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v2 04/11] fbdev: imsttfb: remove the dependency on PPC_OF
Date: Thu, 26 Feb 2015 20:08:16 +0800 [thread overview]
Message-ID: <1424952503-8247-5-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 depend on PPC_OF option any more. This is
a preparation for killing PPC_OF.
Signed-off-by: Kevin Hao <haokexin@gmail.com>
---
v2: Only print the error log when CONFIG_OF is enabled.
drivers/video/fbdev/imsttfb.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
index aae10ce74f14..9b167f7ef6c6 100644
--- a/drivers/video/fbdev/imsttfb.c
+++ b/drivers/video/fbdev/imsttfb.c
@@ -1470,15 +1470,13 @@ 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);
if(dp)
printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
- else
+ else if (IS_ENABLED(CONFIG_OF))
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-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 ` [PATCH v2 01/11] sata_svw: remove the dependency on PPC_OF Kevin Hao
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 ` Kevin Hao [this message]
2015-02-26 12:08 ` [PATCH v2 05/11] fbdev: nvidia: remove the dependency on PPC_OF 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-5-git-send-email-haokexin@gmail.com \
--to=haokexin@gmail.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--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).