Date:2011-06-25 15:54:18 (12 years 9 months ago)
Author:Stefan Schmidt
Commit:f5cd3128bf9ff283c0d5ec911793514d493cd747
Message:spi/atusb: Move atusb_id informations to probing as well.

Register read for at86rf230 stays for now until we have the hooked with the
at86rf230 driver working.

Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Files: drivers/spi/atusb.c (4 diffs)

Change Details

drivers/spi/atusb.c
158158
159159static DEVICE_ATTR(rf_version_num, S_IRUGO, rf_show_version, NULL);
160160
161static ssize_t atusb_show_id(struct device *dev,
162            struct device_attribute *attr,
163            char *buf)
164{
165    struct usb_interface *intf = to_usb_interface(dev);
166    struct atusb_local *atusb = usb_get_intfdata(intf);
167
168    return sprintf(buf, "Major: %u, Minor: %u, HW Type: %u\n",
169            atusb->ep0_atusb_major,
170            atusb->ep0_atusb_minor,
171            atusb->atusb_hw_type);
172}
173
174static DEVICE_ATTR(atusb_id, S_IRUGO, atusb_show_id, NULL);
175
176161static int atusb_setup(struct spi_device *spi)
177162{
178163    struct spi_master *master = spi->master;
...... 
420405    }
421406
422407    dev_info(&udev->dev, "Firmware: %s\n", atusb->atusb_build);
423
408    dev_info(&udev->dev, "Major: %u, Minor: %u, HW Type: %u\n",
409            atusb->ep0_atusb_major, atusb->ep0_atusb_minor,
410            atusb->atusb_hw_type);
424411    /*
425412     * Create the sysfs files
426413     */
427
428    retval = device_create_file(&interface->dev, &dev_attr_atusb_id);
429    if (retval)
430        goto error;
431
432414    retval = device_create_file(&interface->dev, &dev_attr_rf_part_num);
433415    if (retval)
434416        goto error;
...... 
443425error:
444426    device_remove_file(&interface->dev, &dev_attr_rf_version_num);
445427    device_remove_file(&interface->dev, &dev_attr_rf_part_num);
446    device_remove_file(&interface->dev, &dev_attr_atusb_id);
447428    spi_master_put(atusb->master);
448429    kfree(atusb);
449430    return retval;
...... 
460441     */
461442    device_remove_file(&interface->dev, &dev_attr_rf_version_num);
462443    device_remove_file(&interface->dev, &dev_attr_rf_part_num);
463    device_remove_file(&interface->dev, &dev_attr_atusb_id);
464444
465445    usb_set_intfdata(interface, NULL);
466446    usb_put_dev(atusb->udev);

Archive Download the corresponding diff file



interactive