2013-10-07 15:15:57

by Thierry Reding

[permalink] [raw]
Subject: [PATCH] mpc85xx_edac: Remove unused function

Commit 905e75c (powerpc/fsl-pci: Unify pci/pcie initialization code)
removed the struct platform_driver that held the last reference to the
mpc85xx_pci_err_remove() function. Remove the function since it is
effectively dead code.

Signed-off-by: Thierry Reding <[email protected]>
---
drivers/edac/mpc85xx_edac.c | 23 -----------------------
1 file changed, 23 deletions(-)

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 3eb32f6..b1e7106 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -326,29 +326,6 @@ err:
return res;
}
EXPORT_SYMBOL(mpc85xx_pci_err_probe);
-
-static int mpc85xx_pci_err_remove(struct platform_device *op)
-{
- struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev);
- struct mpc85xx_pci_pdata *pdata = pci->pvt_info;
-
- edac_dbg(0, "\n");
-
- out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_CAP_DR,
- orig_pci_err_cap_dr);
-
- out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_EN, orig_pci_err_en);
-
- edac_pci_del_device(pci->dev);
-
- if (edac_op_state == EDAC_OPSTATE_INT)
- irq_dispose_mapping(pdata->irq);
-
- edac_pci_free_ctl_info(pci);
-
- return 0;
-}
-
#endif /* CONFIG_PCI */

/**************************** L2 Err device ***************************/
--
1.8.4


2013-10-07 15:34:48

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH] mpc85xx_edac: Remove unused function

I'm guessing this one is for Johannes. CCed...

On Mon, Oct 07, 2013 at 05:13:55PM +0200, Thierry Reding wrote:
> Commit 905e75c (powerpc/fsl-pci: Unify pci/pcie initialization code)
> removed the struct platform_driver that held the last reference to the
> mpc85xx_pci_err_remove() function. Remove the function since it is
> effectively dead code.
>
> Signed-off-by: Thierry Reding <[email protected]>
> ---
> drivers/edac/mpc85xx_edac.c | 23 -----------------------
> 1 file changed, 23 deletions(-)
>
> diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
> index 3eb32f6..b1e7106 100644
> --- a/drivers/edac/mpc85xx_edac.c
> +++ b/drivers/edac/mpc85xx_edac.c
> @@ -326,29 +326,6 @@ err:
> return res;
> }
> EXPORT_SYMBOL(mpc85xx_pci_err_probe);
> -
> -static int mpc85xx_pci_err_remove(struct platform_device *op)
> -{
> - struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev);
> - struct mpc85xx_pci_pdata *pdata = pci->pvt_info;
> -
> - edac_dbg(0, "\n");
> -
> - out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_CAP_DR,
> - orig_pci_err_cap_dr);
> -
> - out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_EN, orig_pci_err_en);
> -
> - edac_pci_del_device(pci->dev);
> -
> - if (edac_op_state == EDAC_OPSTATE_INT)
> - irq_dispose_mapping(pdata->irq);
> -
> - edac_pci_free_ctl_info(pci);
> -
> - return 0;
> -}
> -
> #endif /* CONFIG_PCI */
>
> /**************************** L2 Err device ***************************/
> --
> 1.8.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-edac" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

2013-10-08 06:39:13

by Johannes Thumshirn

[permalink] [raw]
Subject: Re: [PATCH] mpc85xx_edac: Remove unused function

On Mon, Oct 07, 2013 at 05:13:55PM +0200, Thierry Reding wrote:
> Commit 905e75c (powerpc/fsl-pci: Unify pci/pcie initialization code)
> removed the struct platform_driver that held the last reference to the
> mpc85xx_pci_err_remove() function. Remove the function since it is
> effectively dead code.
>
> Signed-off-by: Thierry Reding <[email protected]>
> ---
> drivers/edac/mpc85xx_edac.c | 23 -----------------------
> 1 file changed, 23 deletions(-)
>
> diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
> index 3eb32f6..b1e7106 100644
> --- a/drivers/edac/mpc85xx_edac.c
> +++ b/drivers/edac/mpc85xx_edac.c
> @@ -326,29 +326,6 @@ err:
> return res;
> }
> EXPORT_SYMBOL(mpc85xx_pci_err_probe);
> -
> -static int mpc85xx_pci_err_remove(struct platform_device *op)
> -{
> - struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev);
> - struct mpc85xx_pci_pdata *pdata = pci->pvt_info;
> -
> - edac_dbg(0, "\n");
> -
> - out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_CAP_DR,
> - orig_pci_err_cap_dr);
> -
> - out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_EN, orig_pci_err_en);
> -
> - edac_pci_del_device(pci->dev);
> -
> - if (edac_op_state == EDAC_OPSTATE_INT)
> - irq_dispose_mapping(pdata->irq);
> -
> - edac_pci_free_ctl_info(pci);
> -
> - return 0;
> -}
> -
> #endif /* CONFIG_PCI */
>
> /**************************** L2 Err device ***************************/
> --
> 1.8.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-edac" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

Hi Thierry,

Sorry, but I already have this patch in
http://lkml.indiana.edu/hypermail/linux/kernel/1309.2/03410.html

But anyways, thanks
Johannes

2013-10-08 09:55:06

by Thierry Reding

[permalink] [raw]
Subject: Re: [PATCH] mpc85xx_edac: Remove unused function

On Tue, Oct 08, 2013 at 08:39:02AM +0200, Johannes Thumshirn wrote:
> On Mon, Oct 07, 2013 at 05:13:55PM +0200, Thierry Reding wrote:
> > Commit 905e75c (powerpc/fsl-pci: Unify pci/pcie initialization code)
> > removed the struct platform_driver that held the last reference to the
> > mpc85xx_pci_err_remove() function. Remove the function since it is
> > effectively dead code.
> >
> > Signed-off-by: Thierry Reding <[email protected]>
> > ---
> > drivers/edac/mpc85xx_edac.c | 23 -----------------------
> > 1 file changed, 23 deletions(-)
> >
> > diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
> > index 3eb32f6..b1e7106 100644
> > --- a/drivers/edac/mpc85xx_edac.c
> > +++ b/drivers/edac/mpc85xx_edac.c
> > @@ -326,29 +326,6 @@ err:
> > return res;
> > }
> > EXPORT_SYMBOL(mpc85xx_pci_err_probe);
> > -
> > -static int mpc85xx_pci_err_remove(struct platform_device *op)
> > -{
> > - struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev);
> > - struct mpc85xx_pci_pdata *pdata = pci->pvt_info;
> > -
> > - edac_dbg(0, "\n");
> > -
> > - out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_CAP_DR,
> > - orig_pci_err_cap_dr);
> > -
> > - out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_EN, orig_pci_err_en);
> > -
> > - edac_pci_del_device(pci->dev);
> > -
> > - if (edac_op_state == EDAC_OPSTATE_INT)
> > - irq_dispose_mapping(pdata->irq);
> > -
> > - edac_pci_free_ctl_info(pci);
> > -
> > - return 0;
> > -}
> > -
> > #endif /* CONFIG_PCI */
> >
> > /**************************** L2 Err device ***************************/
> > --
> > 1.8.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-edac" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> Hi Thierry,
>
> Sorry, but I already have this patch in
> http://lkml.indiana.edu/hypermail/linux/kernel/1309.2/03410.html

No worries.

Thierry


Attachments:
(No filename) (1.90 kB)
(No filename) (836.00 B)
Download all attachments