diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-18 15:39:27 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-19 09:25:55 -0400 |
commit | e132f7f6a2df7b186563775e79c7ab3612ec8116 (patch) | |
tree | ce05717cce1c588f7af1aed82c0465a906f3bd62 /net/bluetooth/hci_sysfs.c | |
parent | 02d08d15e0dae9f571c66cc7529a0138bbae1506 (diff) |
Bluetooth: Remove bus attribute in favor of hierarchy
The bus information are exposed in the actual hierarchy and should
not be exposed as attribute.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_sysfs.c')
-rw-r--r-- | net/bluetooth/hci_sysfs.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 95fc5bb09d95..0b61250cfdf9 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c | |||
@@ -131,28 +131,6 @@ void hci_conn_del_sysfs(struct hci_conn *conn) | |||
131 | hci_dev_put(hdev); | 131 | hci_dev_put(hdev); |
132 | } | 132 | } |
133 | 133 | ||
134 | static inline char *host_bustostr(int bus) | ||
135 | { | ||
136 | switch (bus) { | ||
137 | case HCI_VIRTUAL: | ||
138 | return "VIRTUAL"; | ||
139 | case HCI_USB: | ||
140 | return "USB"; | ||
141 | case HCI_PCCARD: | ||
142 | return "PCCARD"; | ||
143 | case HCI_UART: | ||
144 | return "UART"; | ||
145 | case HCI_RS232: | ||
146 | return "RS232"; | ||
147 | case HCI_PCI: | ||
148 | return "PCI"; | ||
149 | case HCI_SDIO: | ||
150 | return "SDIO"; | ||
151 | default: | ||
152 | return "UNKNOWN"; | ||
153 | } | ||
154 | } | ||
155 | |||
156 | static inline char *host_typetostr(int type) | 134 | static inline char *host_typetostr(int type) |
157 | { | 135 | { |
158 | switch (type) { | 136 | switch (type) { |
@@ -165,13 +143,6 @@ static inline char *host_typetostr(int type) | |||
165 | } | 143 | } |
166 | } | 144 | } |
167 | 145 | ||
168 | static ssize_t show_bus(struct device *dev, | ||
169 | struct device_attribute *attr, char *buf) | ||
170 | { | ||
171 | struct hci_dev *hdev = to_hci_dev(dev); | ||
172 | return sprintf(buf, "%s\n", host_bustostr(hdev->bus)); | ||
173 | } | ||
174 | |||
175 | static ssize_t show_type(struct device *dev, | 146 | static ssize_t show_type(struct device *dev, |
176 | struct device_attribute *attr, char *buf) | 147 | struct device_attribute *attr, char *buf) |
177 | { | 148 | { |
@@ -200,13 +171,11 @@ static ssize_t show_address(struct device *dev, | |||
200 | return sprintf(buf, "%pMR\n", &hdev->bdaddr); | 171 | return sprintf(buf, "%pMR\n", &hdev->bdaddr); |
201 | } | 172 | } |
202 | 173 | ||
203 | static DEVICE_ATTR(bus, S_IRUGO, show_bus, NULL); | ||
204 | static DEVICE_ATTR(type, S_IRUGO, show_type, NULL); | 174 | static DEVICE_ATTR(type, S_IRUGO, show_type, NULL); |
205 | static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); | 175 | static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); |
206 | static DEVICE_ATTR(address, S_IRUGO, show_address, NULL); | 176 | static DEVICE_ATTR(address, S_IRUGO, show_address, NULL); |
207 | 177 | ||
208 | static struct attribute *bt_host_attrs[] = { | 178 | static struct attribute *bt_host_attrs[] = { |
209 | &dev_attr_bus.attr, | ||
210 | &dev_attr_type.attr, | 179 | &dev_attr_type.attr, |
211 | &dev_attr_name.attr, | 180 | &dev_attr_name.attr, |
212 | &dev_attr_address.attr, | 181 | &dev_attr_address.attr, |