[PATCH 05/15] fbdev: imsttfb: remove the dependency on PPC_OF

[Stephen Rothwell]

Hi Kevin,

On Sat, 31 Jan 2015 21:47:35 +0800 Kevin Hao <haokexin at gmail.com> wrote:
>
> 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.

I suspect that you want to do the PPC_OF -> PPC conversion on this file
rather than just removing PPC_OF uses.

> 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;

I see no way in this file for struct device_node to be defined
(especially if CONFIG_PPC is not set).  of.h may be included
implicitly, but that is very dependent on the architecture and CONFIG_
options.

>  	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 */

This will emit the above error if CONFIG_OF is not set whereas in the
past it would not.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20150201/2878ff9b/attachment.sig>