* [PATCH v2] PCI: uniphier: remove module code from built-in driver
@ 2019-12-15 22:39 ` Masahiro Yamada
0 siblings, 0 replies; 6+ messages in thread
From: Masahiro Yamada @ 2019-12-15 22:39 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci
Cc: Masahiro Yamada, Andrew Murray, Kunihiko Hayashi,
Lorenzo Pieralisi, Philipp Zabel, linux-arm-kernel, linux-kernel
builtin_platform_driver() and MODULE_* are always odd combination.
This file is not compiled as a module by anyone because
CONFIG_PCIE_UNIPHIER is a bool option.
Let's remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.
We explicitly disallow a driver unbind, since that doesn't have a
sensible use case anyway, and it allows us to drop the ".remove" code.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Changes in v2:
- update commit description
- remove Reviewed-by
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 8fd7badd59c2..a5401a0b1e58 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>
@@ -171,12 +171,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);
@@ -397,14 +391,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,
@@ -456,31 +442,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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2] PCI: uniphier: remove module code from built-in driver
@ 2019-12-15 22:39 ` Masahiro Yamada
0 siblings, 0 replies; 6+ messages in thread
From: Masahiro Yamada @ 2019-12-15 22:39 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci
Cc: Lorenzo Pieralisi, Kunihiko Hayashi, linux-kernel,
Masahiro Yamada, Philipp Zabel, Andrew Murray, linux-arm-kernel
builtin_platform_driver() and MODULE_* are always odd combination.
This file is not compiled as a module by anyone because
CONFIG_PCIE_UNIPHIER is a bool option.
Let's remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.
We explicitly disallow a driver unbind, since that doesn't have a
sensible use case anyway, and it allows us to drop the ".remove" code.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Changes in v2:
- update commit description
- remove Reviewed-by
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 8fd7badd59c2..a5401a0b1e58 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>
@@ -171,12 +171,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);
@@ -397,14 +391,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,
@@ -456,31 +442,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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] PCI: uniphier: remove module code from built-in driver
2019-12-15 22:39 ` Masahiro Yamada
@ 2020-01-06 12:55 ` Andrew Murray
-1 siblings, 0 replies; 6+ messages in thread
From: Andrew Murray @ 2020-01-06 12:55 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Bjorn Helgaas, linux-pci, Kunihiko Hayashi, Lorenzo Pieralisi,
Philipp Zabel, linux-arm-kernel, linux-kernel
On Mon, Dec 16, 2019 at 07:39:37AM +0900, Masahiro Yamada wrote:
> builtin_platform_driver() and MODULE_* are always odd combination.
>
> This file is not compiled as a module by anyone because
> CONFIG_PCIE_UNIPHIER is a bool option.
>
> Let's remove the modular code that is essentially orphaned, so that
> when reading the driver there is no doubt it is builtin-only.
>
> We explicitly disallow a driver unbind, since that doesn't have a
> sensible use case anyway, and it allows us to drop the ".remove" code.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Andrew Murray <andrew.murray@arm.com>
> ---
>
> Changes in v2:
> - update commit description
> - remove Reviewed-by
>
> 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 8fd7badd59c2..a5401a0b1e58 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>
> @@ -171,12 +171,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);
> @@ -397,14 +391,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,
> @@ -456,31 +442,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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] PCI: uniphier: remove module code from built-in driver
@ 2020-01-06 12:55 ` Andrew Murray
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Murray @ 2020-01-06 12:55 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Lorenzo Pieralisi, Kunihiko Hayashi, linux-pci, linux-kernel,
Philipp Zabel, Bjorn Helgaas, linux-arm-kernel
On Mon, Dec 16, 2019 at 07:39:37AM +0900, Masahiro Yamada wrote:
> builtin_platform_driver() and MODULE_* are always odd combination.
>
> This file is not compiled as a module by anyone because
> CONFIG_PCIE_UNIPHIER is a bool option.
>
> Let's remove the modular code that is essentially orphaned, so that
> when reading the driver there is no doubt it is builtin-only.
>
> We explicitly disallow a driver unbind, since that doesn't have a
> sensible use case anyway, and it allows us to drop the ".remove" code.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Andrew Murray <andrew.murray@arm.com>
> ---
>
> Changes in v2:
> - update commit description
> - remove Reviewed-by
>
> 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 8fd7badd59c2..a5401a0b1e58 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>
> @@ -171,12 +171,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);
> @@ -397,14 +391,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,
> @@ -456,31 +442,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
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] PCI: uniphier: remove module code from built-in driver
2019-12-15 22:39 ` Masahiro Yamada
@ 2020-01-13 16:43 ` Lorenzo Pieralisi
-1 siblings, 0 replies; 6+ messages in thread
From: Lorenzo Pieralisi @ 2020-01-13 16:43 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Bjorn Helgaas, linux-pci, Andrew Murray, Kunihiko Hayashi,
Philipp Zabel, linux-arm-kernel, linux-kernel
On Mon, Dec 16, 2019 at 07:39:37AM +0900, Masahiro Yamada wrote:
> builtin_platform_driver() and MODULE_* are always odd combination.
>
> This file is not compiled as a module by anyone because
> CONFIG_PCIE_UNIPHIER is a bool option.
>
> Let's remove the modular code that is essentially orphaned, so that
> when reading the driver there is no doubt it is builtin-only.
>
> We explicitly disallow a driver unbind, since that doesn't have a
> sensible use case anyway, and it allows us to drop the ".remove" code.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> Changes in v2:
> - update commit description
> - remove Reviewed-by
>
> drivers/pci/controller/dwc/pcie-uniphier.c | 31 +---------------------
> 1 file changed, 1 insertion(+), 30 deletions(-)
Applied to pci/uniphier, thanks.
Lorenzo
> diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/controller/dwc/pcie-uniphier.c
> index 8fd7badd59c2..a5401a0b1e58 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>
> @@ -171,12 +171,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);
> @@ -397,14 +391,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,
> @@ -456,31 +442,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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] PCI: uniphier: remove module code from built-in driver
@ 2020-01-13 16:43 ` Lorenzo Pieralisi
0 siblings, 0 replies; 6+ messages in thread
From: Lorenzo Pieralisi @ 2020-01-13 16:43 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Kunihiko Hayashi, linux-pci, linux-kernel, Philipp Zabel,
Bjorn Helgaas, Andrew Murray, linux-arm-kernel
On Mon, Dec 16, 2019 at 07:39:37AM +0900, Masahiro Yamada wrote:
> builtin_platform_driver() and MODULE_* are always odd combination.
>
> This file is not compiled as a module by anyone because
> CONFIG_PCIE_UNIPHIER is a bool option.
>
> Let's remove the modular code that is essentially orphaned, so that
> when reading the driver there is no doubt it is builtin-only.
>
> We explicitly disallow a driver unbind, since that doesn't have a
> sensible use case anyway, and it allows us to drop the ".remove" code.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> Changes in v2:
> - update commit description
> - remove Reviewed-by
>
> drivers/pci/controller/dwc/pcie-uniphier.c | 31 +---------------------
> 1 file changed, 1 insertion(+), 30 deletions(-)
Applied to pci/uniphier, thanks.
Lorenzo
> diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/controller/dwc/pcie-uniphier.c
> index 8fd7badd59c2..a5401a0b1e58 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>
> @@ -171,12 +171,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);
> @@ -397,14 +391,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,
> @@ -456,31 +442,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
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-01-13 16:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-15 22:39 [PATCH v2] PCI: uniphier: remove module code from built-in driver Masahiro Yamada
2019-12-15 22:39 ` Masahiro Yamada
2020-01-06 12:55 ` Andrew Murray
2020-01-06 12:55 ` Andrew Murray
2020-01-13 16:43 ` Lorenzo Pieralisi
2020-01-13 16:43 ` Lorenzo Pieralisi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.