aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/i2c-hid
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-21 18:14:44 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-03 18:57:16 -0500
commit0fe763c570ad2701c830b9e4e53c65ad89c11c32 (patch)
tree88a648c1cbcda318507d339bf93f1b24af4ff4bf /drivers/hid/i2c-hid
parent8d85fce77edfc22f1d6dbf78e3af723b4b556f3d (diff)
Drivers: misc: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit from these drivers. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/i2c-hid')
-rw-r--r--drivers/hid/i2c-hid/i2c-hid.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index 9ef222442ca0..12e4fdc810bf 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -731,7 +731,7 @@ static struct hid_ll_driver i2c_hid_ll_driver = {
731 .hidinput_input_event = i2c_hid_hidinput_input_event, 731 .hidinput_input_event = i2c_hid_hidinput_input_event,
732}; 732};
733 733
734static int __devinit i2c_hid_init_irq(struct i2c_client *client) 734static int i2c_hid_init_irq(struct i2c_client *client)
735{ 735{
736 struct i2c_hid *ihid = i2c_get_clientdata(client); 736 struct i2c_hid *ihid = i2c_get_clientdata(client);
737 int ret; 737 int ret;
@@ -753,7 +753,7 @@ static int __devinit i2c_hid_init_irq(struct i2c_client *client)
753 return 0; 753 return 0;
754} 754}
755 755
756static int __devinit i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid) 756static int i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid)
757{ 757{
758 struct i2c_client *client = ihid->client; 758 struct i2c_client *client = ihid->client;
759 struct i2c_hid_desc *hdesc = &ihid->hdesc; 759 struct i2c_hid_desc *hdesc = &ihid->hdesc;
@@ -810,8 +810,8 @@ static int __devinit i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid)
810 return 0; 810 return 0;
811} 811}
812 812
813static int __devinit i2c_hid_probe(struct i2c_client *client, 813static int i2c_hid_probe(struct i2c_client *client,
814 const struct i2c_device_id *dev_id) 814 const struct i2c_device_id *dev_id)
815{ 815{
816 int ret; 816 int ret;
817 struct i2c_hid *ihid; 817 struct i2c_hid *ihid;
@@ -902,7 +902,7 @@ err:
902 return ret; 902 return ret;
903} 903}
904 904
905static int __devexit i2c_hid_remove(struct i2c_client *client) 905static int i2c_hid_remove(struct i2c_client *client)
906{ 906{
907 struct i2c_hid *ihid = i2c_get_clientdata(client); 907 struct i2c_hid *ihid = i2c_get_clientdata(client);
908 struct hid_device *hid; 908 struct hid_device *hid;
@@ -967,7 +967,7 @@ static struct i2c_driver i2c_hid_driver = {
967 }, 967 },
968 968
969 .probe = i2c_hid_probe, 969 .probe = i2c_hid_probe,
970 .remove = __devexit_p(i2c_hid_remove), 970 .remove = i2c_hid_remove,
971 971
972 .id_table = i2c_hid_id_table, 972 .id_table = i2c_hid_id_table,
973}; 973};