1 files changed, 3 insertions, 13 deletions

diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index cbf0ff322676..b6adeaee9cc5 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -450,13 +450,13 @@ static struct attribute *tsc2005_attrs[] = {
         NULL
 };
 
-static mode_t tsc2005_attr_is_visible(struct kobject *kobj,
+static umode_t tsc2005_attr_is_visible(struct kobject *kobj,
                                       struct attribute *attr, int n)
 {
         struct device *dev = container_of(kobj, struct device, kobj);
         struct spi_device *spi = to_spi_device(dev);
         struct tsc2005 *ts = spi_get_drvdata(spi);
-        mode_t mode = attr->mode;
+        umode_t mode = attr->mode;
 
         if (attr == &dev_attr_selftest.attr) {
                 if (!ts->set_reset)
@@ -747,17 +747,7 @@ static struct spi_driver tsc2005_driver = {
         .remove = __devexit_p(tsc2005_remove),
 };
 
-static int __init tsc2005_init(void)
-{
-        return spi_register_driver(&tsc2005_driver);
-}
-module_init(tsc2005_init);
-
-static void __exit tsc2005_exit(void)
-{
-        spi_unregister_driver(&tsc2005_driver);
-}
-module_exit(tsc2005_exit);
+module_spi_driver(tsc2005_driver);
 
 MODULE_AUTHOR("Lauri Leukkunen <lauri.leukkunen@nokia.com>");
 MODULE_DESCRIPTION("TSC2005 Touchscreen Driver");