Commit 17f808a7 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Lee Jones
Browse files

mfd: aat2870-core: Make it explicitly non-modular 



The Kconfig currently controlling compilation of this code is:

drivers/mfd/Kconfig:config MFD_AAT2870_CORE
drivers/mfd/Kconfig:    bool "AnalogicTech AAT2870"

...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.

Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.

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

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarJin Park <jinyoungp@nvidia.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent fa56a62d

drivers/mfd/aat2870-core.c

+3 −37
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/debugfs.h>

#include <linux/slab.h>
@@ -349,18 +348,10 @@ static void aat2870_init_debugfs(struct aat2870_data *aat2870) 
			 "Failed to create debugfs register file\n");

}



static void aat2870_uninit_debugfs(struct aat2870_data *aat2870)

{

	debugfs_remove_recursive(aat2870->dentry_root);

}

#else

static inline void aat2870_init_debugfs(struct aat2870_data *aat2870)

{

}



static inline void aat2870_uninit_debugfs(struct aat2870_data *aat2870)

{

}

#endif /* CONFIG_DEBUG_FS */



static int aat2870_i2c_probe(struct i2c_client *client,
@@ -440,20 +431,6 @@ out_disable: 
	return ret;

}



static int aat2870_i2c_remove(struct i2c_client *client)

{

	struct aat2870_data *aat2870 = i2c_get_clientdata(client);



	aat2870_uninit_debugfs(aat2870);



	mfd_remove_devices(aat2870->dev);

	aat2870_disable(aat2870);

	if (aat2870->uninit)

		aat2870->uninit(aat2870);



	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int aat2870_i2c_suspend(struct device *dev)

{
@@ -492,15 +469,14 @@ static const struct i2c_device_id aat2870_i2c_id_table[] = { 
	{ "aat2870", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, aat2870_i2c_id_table);



static struct i2c_driver aat2870_i2c_driver = {

	.driver = {

		.name			= "aat2870",

		.pm			= &aat2870_pm_ops,

		.suppress_bind_attrs	= true,

	},

	.probe		= aat2870_i2c_probe,

	.remove		= aat2870_i2c_remove,

	.id_table	= aat2870_i2c_id_table,

};
@@ -509,13 +485,3 @@ static int __init aat2870_init(void) 
	return i2c_add_driver(&aat2870_i2c_driver);

}

subsys_initcall(aat2870_init);
 


static void __exit aat2870_exit(void)

{

	i2c_del_driver(&aat2870_i2c_driver);

}

module_exit(aat2870_exit);



MODULE_DESCRIPTION("Core support for the AnalogicTech AAT2870");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jin Park <jinyoungp@nvidia.com>");

CRA Git | Maintained and supported by SUSTech CRA and CCSE