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

[Kevin Hao]

On Sun, Feb 01, 2015 at 01:44:33PM +1100, Stephen Rothwell wrote:
> 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.

That was my first thought, but the codes protected by the PPC_OF seem not
ppc specific and should be safe for other archs which also support OF. So I
drop the PPC_OF completely. Did I miss something?

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

This do pass the build test for the non-OF archs, such as x86. But your
concerns sound pretty reasonable, so I will explicitly include of.h.

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

How about change it to:
	if (IS_ENABLED(CONFIG_OF))
  		printk(KERN_ERR "imsttfb: no OF node for pci device\n");

Thanks,
Kevin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20150201/aa703085/attachment.sig>