X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fbluetooth%2Fhci_sysfs.c;h=0ed38740388c374262d90edac9eff42741a0e0da;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=3987d167f04e73225ea98556bd1f583c899e9223;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 3987d167f..0ed387403 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c @@ -1,10 +1,9 @@ /* Bluetooth HCI driver model support. */ +#include #include #include -#include - #include #include @@ -13,35 +12,35 @@ #define BT_DBG(D...) #endif -static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t show_name(struct class_device *cdev, char *buf) { - struct hci_dev *hdev = dev_get_drvdata(dev); + struct hci_dev *hdev = class_get_devdata(cdev); return sprintf(buf, "%s\n", hdev->name); } -static ssize_t show_type(struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t show_type(struct class_device *cdev, char *buf) { - struct hci_dev *hdev = dev_get_drvdata(dev); + struct hci_dev *hdev = class_get_devdata(cdev); return sprintf(buf, "%d\n", hdev->type); } -static ssize_t show_address(struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t show_address(struct class_device *cdev, char *buf) { - struct hci_dev *hdev = dev_get_drvdata(dev); + struct hci_dev *hdev = class_get_devdata(cdev); bdaddr_t bdaddr; baswap(&bdaddr, &hdev->bdaddr); return sprintf(buf, "%s\n", batostr(&bdaddr)); } -static ssize_t show_flags(struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t show_flags(struct class_device *cdev, char *buf) { - struct hci_dev *hdev = dev_get_drvdata(dev); + struct hci_dev *hdev = class_get_devdata(cdev); return sprintf(buf, "0x%lx\n", hdev->flags); } -static ssize_t show_inquiry_cache(struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t show_inquiry_cache(struct class_device *cdev, char *buf) { - struct hci_dev *hdev = dev_get_drvdata(dev); + struct hci_dev *hdev = class_get_devdata(cdev); struct inquiry_cache *cache = &hdev->inq_cache; struct inquiry_entry *e; int n = 0; @@ -63,193 +62,94 @@ static ssize_t show_inquiry_cache(struct device *dev, struct device_attribute *a return n; } -static ssize_t show_idle_timeout(struct device *dev, struct device_attribute *attr, char *buf) -{ - struct hci_dev *hdev = dev_get_drvdata(dev); - return sprintf(buf, "%d\n", hdev->idle_timeout); -} - -static ssize_t store_idle_timeout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) -{ - struct hci_dev *hdev = dev_get_drvdata(dev); - char *ptr; - __u32 val; - - val = simple_strtoul(buf, &ptr, 10); - if (ptr == buf) - return -EINVAL; - - if (val != 0 && (val < 500 || val > 3600000)) - return -EINVAL; +static CLASS_DEVICE_ATTR(name, S_IRUGO, show_name, NULL); +static CLASS_DEVICE_ATTR(type, S_IRUGO, show_type, NULL); +static CLASS_DEVICE_ATTR(address, S_IRUGO, show_address, NULL); +static CLASS_DEVICE_ATTR(flags, S_IRUGO, show_flags, NULL); +static CLASS_DEVICE_ATTR(inquiry_cache, S_IRUGO, show_inquiry_cache, NULL); - hdev->idle_timeout = val; - - return count; -} - -static ssize_t show_sniff_max_interval(struct device *dev, struct device_attribute *attr, char *buf) -{ - struct hci_dev *hdev = dev_get_drvdata(dev); - return sprintf(buf, "%d\n", hdev->sniff_max_interval); -} +static struct class_device_attribute *bt_attrs[] = { + &class_device_attr_name, + &class_device_attr_type, + &class_device_attr_address, + &class_device_attr_flags, + &class_device_attr_inquiry_cache, + NULL +}; -static ssize_t store_sniff_max_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +#ifdef CONFIG_HOTPLUG +static int bt_uevent(struct class_device *cdev, char **envp, int num_envp, char *buf, int size) { - struct hci_dev *hdev = dev_get_drvdata(dev); - char *ptr; - __u16 val; - - val = simple_strtoul(buf, &ptr, 10); - if (ptr == buf) - return -EINVAL; - - if (val < 0x0002 || val > 0xFFFE || val % 2) - return -EINVAL; + struct hci_dev *hdev = class_get_devdata(cdev); + int n, i = 0; - if (val < hdev->sniff_min_interval) - return -EINVAL; + envp[i++] = buf; + n = snprintf(buf, size, "INTERFACE=%s", hdev->name) + 1; + buf += n; + size -= n; - hdev->sniff_max_interval = val; + if ((size <= 0) || (i >= num_envp)) + return -ENOMEM; - return count; -} - -static ssize_t show_sniff_min_interval(struct device *dev, struct device_attribute *attr, char *buf) -{ - struct hci_dev *hdev = dev_get_drvdata(dev); - return sprintf(buf, "%d\n", hdev->sniff_min_interval); + envp[i] = NULL; + return 0; } +#endif -static ssize_t store_sniff_min_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +static void bt_release(struct class_device *cdev) { - struct hci_dev *hdev = dev_get_drvdata(dev); - char *ptr; - __u16 val; - - val = simple_strtoul(buf, &ptr, 10); - if (ptr == buf) - return -EINVAL; - - if (val < 0x0002 || val > 0xFFFE || val % 2) - return -EINVAL; - - if (val > hdev->sniff_max_interval) - return -EINVAL; - - hdev->sniff_min_interval = val; + struct hci_dev *hdev = class_get_devdata(cdev); - return count; + kfree(hdev); } -static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); -static DEVICE_ATTR(type, S_IRUGO, show_type, NULL); -static DEVICE_ATTR(address, S_IRUGO, show_address, NULL); -static DEVICE_ATTR(flags, S_IRUGO, show_flags, NULL); -static DEVICE_ATTR(inquiry_cache, S_IRUGO, show_inquiry_cache, NULL); - -static DEVICE_ATTR(idle_timeout, S_IRUGO | S_IWUSR, - show_idle_timeout, store_idle_timeout); -static DEVICE_ATTR(sniff_max_interval, S_IRUGO | S_IWUSR, - show_sniff_max_interval, store_sniff_max_interval); -static DEVICE_ATTR(sniff_min_interval, S_IRUGO | S_IWUSR, - show_sniff_min_interval, store_sniff_min_interval); - -static struct device_attribute *bt_attrs[] = { - &dev_attr_name, - &dev_attr_type, - &dev_attr_address, - &dev_attr_flags, - &dev_attr_inquiry_cache, - &dev_attr_idle_timeout, - &dev_attr_sniff_max_interval, - &dev_attr_sniff_min_interval, - NULL +struct class bt_class = { + .name = "bluetooth", + .release = bt_release, +#ifdef CONFIG_HOTPLUG + .uevent = bt_uevent, +#endif }; -struct class *bt_class = NULL; EXPORT_SYMBOL_GPL(bt_class); -static struct bus_type bt_bus = { - .name = "bluetooth", -}; - -static struct platform_device *bt_platform; - -static void bt_release(struct device *dev) -{ - struct hci_dev *hdev = dev_get_drvdata(dev); - kfree(hdev); -} - int hci_register_sysfs(struct hci_dev *hdev) { - struct device *dev = &hdev->dev; + struct class_device *cdev = &hdev->class_dev; unsigned int i; int err; BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type); - dev->class = bt_class; - - if (hdev->parent) - dev->parent = hdev->parent; - else - dev->parent = &bt_platform->dev; - - strlcpy(dev->bus_id, hdev->name, BUS_ID_SIZE); - - dev->release = bt_release; + cdev->class = &bt_class; + class_set_devdata(cdev, hdev); - dev_set_drvdata(dev, hdev); - - err = device_register(dev); + strlcpy(cdev->class_id, hdev->name, BUS_ID_SIZE); + err = class_device_register(cdev); if (err < 0) return err; for (i = 0; bt_attrs[i]; i++) - device_create_file(dev, bt_attrs[i]); + class_device_create_file(cdev, bt_attrs[i]); return 0; } void hci_unregister_sysfs(struct hci_dev *hdev) { - struct device *dev = &hdev->dev; + struct class_device * cdev = &hdev->class_dev; BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type); - device_del(dev); + class_device_del(cdev); } int __init bt_sysfs_init(void) { - int err; - - bt_platform = platform_device_register_simple("bluetooth", -1, NULL, 0); - if (IS_ERR(bt_platform)) - return PTR_ERR(bt_platform); - - err = bus_register(&bt_bus); - if (err < 0) { - platform_device_unregister(bt_platform); - return err; - } - - bt_class = class_create(THIS_MODULE, "bluetooth"); - if (IS_ERR(bt_class)) { - bus_unregister(&bt_bus); - platform_device_unregister(bt_platform); - return PTR_ERR(bt_class); - } - - return 0; + return class_register(&bt_class); } void __exit bt_sysfs_cleanup(void) { - class_destroy(bt_class); - - bus_unregister(&bt_bus); - - platform_device_unregister(bt_platform); + class_unregister(&bt_class); }