| Message ID | 20191114122654.1490-1-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 01b810ed71878785d189d01e4d7425a11203d7a8 |
| Headers | show |
| Series | PCI: uniphier: remove module code from built-in driver | expand |
On Thu, Nov 14, 2019 at 09:26:54PM +0900, Masahiro Yamada wrote: > builtin_platform_driver() and MODULE_* are always odd combination. > > The MODULE_* tags are never populated since CONFIG_PCIE_UNIPHIER is > a bool option. > > You can see similar cleanups by: > git log --grep='explicitly non-modular' Thanks for the justification, it's helpful - however this doesn't belong on the commit message so please remove that. > > Following those commits, remove all the MODULE_* tags and the driver > detach code. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Reviewed-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Please remove Reviewed-by tags that were not given on the public lists, reviews should be performed on list (as per [1]). [1] https://lore.kernel.org/linux-arm-kernel/20191015164303.GC25674@e121166-lin.cambridge.arm.com/ The patch looks OK to me - however can you update the commit message to better describe this (take inspiration from the examples you gave)? And there is no need to make any reference to similar commits in the history. Thanks, Andrew Murray > --- > > drivers/pci/controller/dwc/pcie-uniphier.c | 31 +--------------------- > 1 file changed, 1 insertion(+), 30 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/controller/dwc/pcie-uniphier.c > index 3f30ee4a00b3..8c92b660a0f6 100644 > --- a/drivers/pci/controller/dwc/pcie-uniphier.c > +++ b/drivers/pci/controller/dwc/pcie-uniphier.c > @@ -9,11 +9,11 @@ > #include <linux/bitfield.h> > #include <linux/clk.h> > #include <linux/delay.h> > +#include <linux/init.h> > #include <linux/interrupt.h> > #include <linux/iopoll.h> > #include <linux/irqchip/chained_irq.h> > #include <linux/irqdomain.h> > -#include <linux/module.h> > #include <linux/of_irq.h> > #include <linux/pci.h> > #include <linux/phy/phy.h> > @@ -161,12 +161,6 @@ static void uniphier_pcie_irq_enable(struct uniphier_pcie_priv *priv) > writel(PCL_RCV_INTX_ALL_ENABLE, priv->base + PCL_RCV_INTX); > } > > -static void uniphier_pcie_irq_disable(struct uniphier_pcie_priv *priv) > -{ > - writel(0, priv->base + PCL_RCV_INT); > - writel(0, priv->base + PCL_RCV_INTX); > -} > - > static void uniphier_pcie_irq_ack(struct irq_data *d) > { > struct pcie_port *pp = irq_data_get_irq_chip_data(d); > @@ -387,14 +381,6 @@ static int uniphier_pcie_host_enable(struct uniphier_pcie_priv *priv) > return ret; > } > > -static void uniphier_pcie_host_disable(struct uniphier_pcie_priv *priv) > -{ > - uniphier_pcie_irq_disable(priv); > - phy_exit(priv->phy); > - reset_control_assert(priv->rst); > - clk_disable_unprepare(priv->clk); > -} > - > static const struct dw_pcie_ops dw_pcie_ops = { > .start_link = uniphier_pcie_establish_link, > .stop_link = uniphier_pcie_stop_link, > @@ -446,31 +432,16 @@ static int uniphier_pcie_probe(struct platform_device *pdev) > return uniphier_add_pcie_port(priv, pdev); > } > > -static int uniphier_pcie_remove(struct platform_device *pdev) > -{ > - struct uniphier_pcie_priv *priv = platform_get_drvdata(pdev); > - > - uniphier_pcie_host_disable(priv); > - > - return 0; > -} > - > static const struct of_device_id uniphier_pcie_match[] = { > { .compatible = "socionext,uniphier-pcie", }, > { /* sentinel */ }, > }; > -MODULE_DEVICE_TABLE(of, uniphier_pcie_match); > > static struct platform_driver uniphier_pcie_driver = { > .probe = uniphier_pcie_probe, > - .remove = uniphier_pcie_remove, > .driver = { > .name = "uniphier-pcie", > .of_match_table = uniphier_pcie_match, > }, > }; > builtin_platform_driver(uniphier_pcie_driver); > - > -MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>"); > -MODULE_DESCRIPTION("UniPhier PCIe host controller driver"); > -MODULE_LICENSE("GPL v2"); > -- > 2.17.1 >
diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/controller/dwc/pcie-uniphier.c index 3f30ee4a00b3..8c92b660a0f6 100644 --- a/drivers/pci/controller/dwc/pcie-uniphier.c +++ b/drivers/pci/controller/dwc/pcie-uniphier.c @@ -9,11 +9,11 @@ #include <linux/bitfield.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/init.h> #include <linux/interrupt.h> #include <linux/iopoll.h> #include <linux/irqchip/chained_irq.h> #include <linux/irqdomain.h> -#include <linux/module.h> #include <linux/of_irq.h> #include <linux/pci.h> #include <linux/phy/phy.h> @@ -161,12 +161,6 @@ static void uniphier_pcie_irq_enable(struct uniphier_pcie_priv *priv) writel(PCL_RCV_INTX_ALL_ENABLE, priv->base + PCL_RCV_INTX); } -static void uniphier_pcie_irq_disable(struct uniphier_pcie_priv *priv) -{ - writel(0, priv->base + PCL_RCV_INT); - writel(0, priv->base + PCL_RCV_INTX); -} - static void uniphier_pcie_irq_ack(struct irq_data *d) { struct pcie_port *pp = irq_data_get_irq_chip_data(d); @@ -387,14 +381,6 @@ static int uniphier_pcie_host_enable(struct uniphier_pcie_priv *priv) return ret; } -static void uniphier_pcie_host_disable(struct uniphier_pcie_priv *priv) -{ - uniphier_pcie_irq_disable(priv); - phy_exit(priv->phy); - reset_control_assert(priv->rst); - clk_disable_unprepare(priv->clk); -} - static const struct dw_pcie_ops dw_pcie_ops = { .start_link = uniphier_pcie_establish_link, .stop_link = uniphier_pcie_stop_link, @@ -446,31 +432,16 @@ static int uniphier_pcie_probe(struct platform_device *pdev) return uniphier_add_pcie_port(priv, pdev); } -static int uniphier_pcie_remove(struct platform_device *pdev) -{ - struct uniphier_pcie_priv *priv = platform_get_drvdata(pdev); - - uniphier_pcie_host_disable(priv); - - return 0; -} - static const struct of_device_id uniphier_pcie_match[] = { { .compatible = "socionext,uniphier-pcie", }, { /* sentinel */ }, }; -MODULE_DEVICE_TABLE(of, uniphier_pcie_match); static struct platform_driver uniphier_pcie_driver = { .probe = uniphier_pcie_probe, - .remove = uniphier_pcie_remove, .driver = { .name = "uniphier-pcie", .of_match_table = uniphier_pcie_match, }, }; builtin_platform_driver(uniphier_pcie_driver); - -MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>"); -MODULE_DESCRIPTION("UniPhier PCIe host controller driver"); -MODULE_LICENSE("GPL v2");