From patchwork Sat Jan 31 13:47:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 435134 X-Patchwork-Delegate: michael@ellerman.id.au 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 5A6F51401F0 for ; Sun, 1 Feb 2015 00:52:41 +1100 (AEDT) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id 4AB281A14F2 for ; Sun, 1 Feb 2015 00:52:41 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-yh0-x235.google.com (mail-yh0-x235.google.com [IPv6:2607:f8b0:4002:c01::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 77A6C1A0EB3 for ; Sun, 1 Feb 2015 00:48:30 +1100 (AEDT) Received: by mail-yh0-f53.google.com with SMTP id v1so12971029yhn.12 for ; Sat, 31 Jan 2015 05:48:28 -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=VuNY/iftThc9WmrRd+z+w9hjxCWxkEI+SjuW4NP7TxQ=; b=vgewBrG1wp8O6eT4yFYv1ATSAkQO3ysxm7LRviHZcqxFNgy5AP2taY4hqs5cXJZb4N iYz0t9ORlnVVymMt87tzsPep0TqYBCCrbYPv8peZav4QxpqYdplc/0fe0wdlFSSyLGRh /AMcwQ+odoH1NmZMk/LZaPoQdZhuRU1PPxYjy/vPgDjCrPTywTH7KxS3I+D6l8kME15Q nIH8rqu13MaXzwuQ4dj/ORegC4lAsVyY2n1HFoQtCDGMyvcmWt3gEFkkX8CzdlzFYU6B 8igocqGDR0lffe9BHzuj6Wu76M00oKQGGIND4XxUUlw3ZDpBnwU+cZCK0OiZbjPKro0P iIUA== X-Received: by 10.170.95.7 with SMTP id m7mr6147100yka.67.1422712108308; Sat, 31 Jan 2015 05:48:28 -0800 (PST) Received: from pek-khao-d1.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id z23sm8423995yhz.35.2015.01.31.05.48.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Jan 2015 05:48:27 -0800 (PST) From: Kevin Hao To: linuxppc-dev@lists.ozlabs.org, linux-fbdev@vger.kernel.org Subject: [PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF Date: Sat, 31 Jan 2015 21:47:35 +0800 Message-Id: <1422712065-9403-6-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1422712065-9403-1-git-send-email-haokexin@gmail.com> References: <1422712065-9403-1-git-send-email-haokexin@gmail.com> Cc: Kevin Hao , Tomi Valkeinen , Jean-Christophe Plagniol-Villard 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 --- 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;