From patchwork Thu Feb 26 12:08:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 443892 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 E23F31400D5 for ; Thu, 26 Feb 2015 23:17:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=F04u/0s2; 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 ADA951A03BC for ; Thu, 26 Feb 2015 23:17:05 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=F04u/0s2; 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-yk0-x22f.google.com (mail-yk0-x22f.google.com [IPv6:2607:f8b0:4002:c07::22f]) (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 EB0431A00FB for ; Thu, 26 Feb 2015 23:09:31 +1100 (AEDT) Received: by ykp9 with SMTP id 9so3832808ykp.10 for ; Thu, 26 Feb 2015 04:09:29 -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=+gahf4TLgtr4OkfHBGAWV/0KLdd7hXZFZ+814ToRhe8=; b=F04u/0s2+ip8Mci3LQPa9KPYJMNUDX/wuiL0uieT6gdZG1TJYikxYaQr2v/pnd0XzM 0rpqYB8R/pSAWxOpAQEB1FL0AgMa/gWcn0A/e1bADUvNJI4sRnzYxK7gNRE7NSEtKFHO r0cL7y9tKrAc/fLD/oe50Z1Ylpue7pOwwe7BhOCkTRtnrOj5B0u8TxuhrIKo/TpoyR49 dkKrnw+qZP0Tolc2xyoVzopGm91fSXqY3AoFy0nZtThcRHRub1Z8SSCXPp+XGFmXFLYR C+82jmgfkoSZYFZUFIzv1dNB6dQvNRjwmnvLUv83rJNAaupRMoSSTFVbXCRjSBZJt78z 4w8Q== X-Received: by 10.236.50.161 with SMTP id z21mr7913318yhb.18.1424952569773; Thu, 26 Feb 2015 04:09:29 -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.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2015 04:09:28 -0800 (PST) From: Kevin Hao To: Michael Ellerman Subject: [PATCH v2 04/11] fbdev: imsttfb: remove the dependency on PPC_OF Date: Thu, 26 Feb 2015 20:08:16 +0800 Message-Id: <1424952503-8247-5-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: Jean-Christophe Plagniol-Villard , linux-fbdev@vger.kernel.org, Tomi Valkeinen , 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 depend on PPC_OF option any more. This is a preparation for killing PPC_OF. Signed-off-by: Kevin Hao --- 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;