lkml.org 
[lkml]   [2019]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 03/18] mfd: ezx-pcap: Make it explicitly non-modular
Date
The Kconfig currently controlling compilation of this code is:

drivers/mfd/Kconfig:config EZX_PCAP
drivers/mfd/Kconfig: bool "Motorola EZXPCAP Support"

...meaning that it currently is not being built as a module by anyone.

Lets 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 for non-modular drivers.

Since module_init was not in use by this code, the init ordering
remains unchanged with this commit.

We also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.

Cc: Lee Jones <lee.jones@linaro.org>
Cc: Daniel Ribeiro <drwyrm@gmail.com>
Cc: Harald Welte <laforge@openezx.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/mfd/ezx-pcap.c | 42 +++---------------------------------------
1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index 70fa18b04ad2..954a27985b2f 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -6,7 +6,7 @@
* Copyright (C) 2009 Daniel Ribeiro <drwyrm@gmail.com>
*/

-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
@@ -392,30 +392,6 @@ static int pcap_add_subdev(struct pcap_chip *pcap,
return ret;
}

-static int ezx_pcap_remove(struct spi_device *spi)
-{
- struct pcap_chip *pcap = spi_get_drvdata(spi);
- unsigned long flags;
- int i;
-
- /* remove all registered subdevs */
- device_for_each_child(&spi->dev, NULL, pcap_remove_subdev);
-
- /* cleanup ADC */
- spin_lock_irqsave(&pcap->adc_lock, flags);
- for (i = 0; i < PCAP_ADC_MAXQ; i++)
- kfree(pcap->adc_queue[i]);
- spin_unlock_irqrestore(&pcap->adc_lock, flags);
-
- /* cleanup irqchip */
- for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++)
- irq_set_chip_and_handler(i, NULL, NULL);
-
- destroy_workqueue(pcap->workqueue);
-
- return 0;
-}
-
static int ezx_pcap_probe(struct spi_device *spi)
{
struct pcap_platform_data *pdata = dev_get_platdata(&spi->dev);
@@ -513,9 +489,9 @@ static int ezx_pcap_probe(struct spi_device *spi)

static struct spi_driver ezxpcap_driver = {
.probe = ezx_pcap_probe,
- .remove = ezx_pcap_remove,
.driver = {
- .name = "ezx-pcap",
+ .name = "ezx-pcap",
+ .suppress_bind_attrs = true,
},
};

@@ -523,16 +499,4 @@ static int __init ezx_pcap_init(void)
{
return spi_register_driver(&ezxpcap_driver);
}
-
-static void __exit ezx_pcap_exit(void)
-{
- spi_unregister_driver(&ezxpcap_driver);
-}
-
subsys_initcall(ezx_pcap_init);
-module_exit(ezx_pcap_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Daniel Ribeiro / Harald Welte");
-MODULE_DESCRIPTION("Motorola PCAP2 ASIC Driver");
-MODULE_ALIAS("spi:ezx-pcap");
--
2.7.4
\
 
 \ /
  Last update: 2019-12-18 21:50    [W:0.078 / U:28.656 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site