aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-05-21 00:17:22 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-07-10 00:35:15 -0400
commit5c659c62f9f60633a8de17bd17afaa448f1e1d68 (patch)
treef579f36dce9b3ffd980833a8ddb0b5f4e0292a0b /drivers/input/tablet
parent9b40ed088bb14ebed30540b19d5c417dc4d9d528 (diff)
Input: aiptek - remove vendor and product attributes from sysfs
They are already exported by input core; there is no need to do it twice. Signed-off-by: Rene van Paassen <rene.vanpaassen@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/tablet')
-rw-r--r--drivers/input/tablet/aiptek.c73
1 files changed, 0 insertions, 73 deletions
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index c4df4f727f1f..f9a5f872505f 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1023,71 +1023,6 @@ static ssize_t show_tabletSize(struct device *dev, struct device_attribute *attr
1023static DEVICE_ATTR(size, S_IRUGO, show_tabletSize, NULL); 1023static DEVICE_ATTR(size, S_IRUGO, show_tabletSize, NULL);
1024 1024
1025/*********************************************************************** 1025/***********************************************************************
1026 * support routines for the 'product_id' file
1027 */
1028static ssize_t show_tabletProductId(struct device *dev, struct device_attribute *attr, char *buf)
1029{
1030 struct aiptek *aiptek = dev_get_drvdata(dev);
1031
1032 if (aiptek == NULL)
1033 return 0;
1034
1035 return snprintf(buf, PAGE_SIZE, "0x%04x\n",
1036 aiptek->inputdev->id.product);
1037}
1038
1039static DEVICE_ATTR(product_id, S_IRUGO, show_tabletProductId, NULL);
1040
1041/***********************************************************************
1042 * support routines for the 'vendor_id' file
1043 */
1044static ssize_t show_tabletVendorId(struct device *dev, struct device_attribute *attr, char *buf)
1045{
1046 struct aiptek *aiptek = dev_get_drvdata(dev);
1047
1048 if (aiptek == NULL)
1049 return 0;
1050
1051 return snprintf(buf, PAGE_SIZE, "0x%04x\n", aiptek->inputdev->id.vendor);
1052}
1053
1054static DEVICE_ATTR(vendor_id, S_IRUGO, show_tabletVendorId, NULL);
1055
1056/***********************************************************************
1057 * support routines for the 'vendor' file
1058 */
1059static ssize_t show_tabletManufacturer(struct device *dev, struct device_attribute *attr, char *buf)
1060{
1061 struct aiptek *aiptek = dev_get_drvdata(dev);
1062 int retval;
1063
1064 if (aiptek == NULL)
1065 return 0;
1066
1067 retval = snprintf(buf, PAGE_SIZE, "%s\n", aiptek->usbdev->manufacturer);
1068 return retval;
1069}
1070
1071static DEVICE_ATTR(vendor, S_IRUGO, show_tabletManufacturer, NULL);
1072
1073/***********************************************************************
1074 * support routines for the 'product' file
1075 */
1076static ssize_t show_tabletProduct(struct device *dev, struct device_attribute *attr, char *buf)
1077{
1078 struct aiptek *aiptek = dev_get_drvdata(dev);
1079 int retval;
1080
1081 if (aiptek == NULL)
1082 return 0;
1083
1084 retval = snprintf(buf, PAGE_SIZE, "%s\n", aiptek->usbdev->product);
1085 return retval;
1086}
1087
1088static DEVICE_ATTR(product, S_IRUGO, show_tabletProduct, NULL);
1089
1090/***********************************************************************
1091 * support routines for the 'pointer_mode' file. Note that this file 1026 * support routines for the 'pointer_mode' file. Note that this file
1092 * both displays current setting and allows reprogramming. 1027 * both displays current setting and allows reprogramming.
1093 */ 1028 */
@@ -1867,10 +1802,6 @@ static DEVICE_ATTR(firmware_code, S_IRUGO, show_firmwareCode, NULL);
1867static void aiptek_delete_files(struct device *dev) 1802static void aiptek_delete_files(struct device *dev)
1868{ 1803{
1869 device_remove_file(dev, &dev_attr_size); 1804 device_remove_file(dev, &dev_attr_size);
1870 device_remove_file(dev, &dev_attr_product_id);
1871 device_remove_file(dev, &dev_attr_vendor_id);
1872 device_remove_file(dev, &dev_attr_vendor);
1873 device_remove_file(dev, &dev_attr_product);
1874 device_remove_file(dev, &dev_attr_pointer_mode); 1805 device_remove_file(dev, &dev_attr_pointer_mode);
1875 device_remove_file(dev, &dev_attr_coordinate_mode); 1806 device_remove_file(dev, &dev_attr_coordinate_mode);
1876 device_remove_file(dev, &dev_attr_tool_mode); 1807 device_remove_file(dev, &dev_attr_tool_mode);
@@ -1901,10 +1832,6 @@ static int aiptek_add_files(struct device *dev)
1901 int ret; 1832 int ret;
1902 1833
1903 if ((ret = device_create_file(dev, &dev_attr_size)) || 1834 if ((ret = device_create_file(dev, &dev_attr_size)) ||
1904 (ret = device_create_file(dev, &dev_attr_product_id)) ||
1905 (ret = device_create_file(dev, &dev_attr_vendor_id)) ||
1906 (ret = device_create_file(dev, &dev_attr_vendor)) ||
1907 (ret = device_create_file(dev, &dev_attr_product)) ||
1908 (ret = device_create_file(dev, &dev_attr_pointer_mode)) || 1835 (ret = device_create_file(dev, &dev_attr_pointer_mode)) ||
1909 (ret = device_create_file(dev, &dev_attr_coordinate_mode)) || 1836 (ret = device_create_file(dev, &dev_attr_coordinate_mode)) ||
1910 (ret = device_create_file(dev, &dev_attr_tool_mode)) || 1837 (ret = device_create_file(dev, &dev_attr_tool_mode)) ||