Message ID | 1351736348-26754-1-git-send-email-B38951@freescale.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
Jia Hongtao wrote: > +#ifdef CONFIG_SUSPEND > +static int fsl_pci_resume(struct platform_device *pdev) > +{ > + struct pci_controller *hose; > + struct resource pci_rsrc; > + > + hose = pci_find_hose_for_OF_device(pdev->dev.of_node); > + of_address_to_resource(pdev->dev.of_node, 0, &pci_rsrc); > + setup_pci_atmu(hose, &pci_rsrc); > + > + return 0; > +} Some of these functions can fail, so they should return an error code if they do. > +#endif > + > static struct platform_driver fsl_pci_driver = { > .driver = { > .name = "fsl-pci", > .of_match_table = pci_ids, > }, > .probe = fsl_pci_probe, > +#ifdef CONFIG_SUSPEND > + .resume = fsl_pci_resume, > +#endif Do this instead: #ifdef CONFIG_SUSPEND static int fsl_pci_resume(struct platform_device *pdev) ... #else #define fsl_pci_resume NULL #endif
> -----Original Message----- > From: Tabi Timur-B04825 > Sent: Thursday, November 01, 2012 9:26 PM > To: Jia Hongtao-B38951 > Cc: linuxppc-dev@lists.ozlabs.org; galak@kernel.crashing.org; Wood Scott- > B07421; Li Yang-R58472 > Subject: Re: [linuxppc-release] [PATCH] powerpc/fsl-pci: Add PCI > controller ATMU PM support > > Jia Hongtao wrote: > > > +#ifdef CONFIG_SUSPEND > > +static int fsl_pci_resume(struct platform_device *pdev) > > +{ > > + struct pci_controller *hose; > > + struct resource pci_rsrc; > > + > > + hose = pci_find_hose_for_OF_device(pdev->dev.of_node); > > + of_address_to_resource(pdev->dev.of_node, 0, &pci_rsrc); > > + setup_pci_atmu(hose, &pci_rsrc); > > + > > + return 0; > > +} > > Some of these functions can fail, so they should return an error code if > they do. I checked the of_address_to_resource function now. Is that necessary to check other two fuctions? > > > +#endif > > + > > static struct platform_driver fsl_pci_driver = { > > .driver = { > > .name = "fsl-pci", > > .of_match_table = pci_ids, > > }, > > .probe = fsl_pci_probe, > > +#ifdef CONFIG_SUSPEND > > + .resume = fsl_pci_resume, > > +#endif > > Do this instead: > > #ifdef CONFIG_SUSPEND > static int fsl_pci_resume(struct platform_device *pdev) > ... > #else > #define fsl_pci_resume NULL > #endif Ok, I will update this. -Hongtao.
Jia Hongtao-B38951 wrote: >> >>> +#ifdef CONFIG_SUSPEND >>> +static int fsl_pci_resume(struct platform_device *pdev) >>> +{ >>> + struct pci_controller *hose; >>> + struct resource pci_rsrc; >>> + >>> + hose = pci_find_hose_for_OF_device(pdev->dev.of_node); >>> + of_address_to_resource(pdev->dev.of_node, 0, &pci_rsrc); >>> + setup_pci_atmu(hose, &pci_rsrc); >>> + >>> + return 0; >>> +} >> >> Some of these functions can fail, so they should return an error code if >> they do. > > I checked the of_address_to_resource function now. > Is that necessary to check other two fuctions? Yes, check to ensure that 'hose' is not NULL.
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index ffb93ae..793a017 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -89,7 +89,7 @@ static int fsl_pci_dma_set_mask(struct device *dev, u64 dma_mask) return 0; } -static int __init setup_one_atmu(struct ccsr_pci __iomem *pci, +static int setup_one_atmu(struct ccsr_pci __iomem *pci, unsigned int index, const struct resource *res, resource_size_t offset) { @@ -126,7 +126,7 @@ static int __init setup_one_atmu(struct ccsr_pci __iomem *pci, } /* atmu setup for fsl pci/pcie controller */ -static void __init setup_pci_atmu(struct pci_controller *hose, +static void setup_pci_atmu(struct pci_controller *hose, struct resource *rsrc) { struct ccsr_pci __iomem *pci; @@ -902,12 +902,29 @@ static int __devinit fsl_pci_probe(struct platform_device *pdev) return 0; } +#ifdef CONFIG_SUSPEND +static int fsl_pci_resume(struct platform_device *pdev) +{ + struct pci_controller *hose; + struct resource pci_rsrc; + + hose = pci_find_hose_for_OF_device(pdev->dev.of_node); + of_address_to_resource(pdev->dev.of_node, 0, &pci_rsrc); + setup_pci_atmu(hose, &pci_rsrc); + + return 0; +} +#endif + static struct platform_driver fsl_pci_driver = { .driver = { .name = "fsl-pci", .of_match_table = pci_ids, }, .probe = fsl_pci_probe, +#ifdef CONFIG_SUSPEND + .resume = fsl_pci_resume, +#endif }; static int __init fsl_pci_init(void)