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 | ||
---|---|---|
158 | 158 | |
159 | 159 | static DEVICE_ATTR(rf_version_num, S_IRUGO, rf_show_version, NULL); |
160 | 160 | |
161 | static 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 | ||
174 | static DEVICE_ATTR(atusb_id, S_IRUGO, atusb_show_id, NULL); | |
175 | ||
176 | 161 | static int atusb_setup(struct spi_device *spi) |
177 | 162 | { |
178 | 163 | struct spi_master *master = spi->master; |
... | ... | |
420 | 405 | } |
421 | 406 | |
422 | 407 | 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); | |
424 | 411 | /* |
425 | 412 | * Create the sysfs files |
426 | 413 | */ |
427 | ||
428 | retval = device_create_file(&interface->dev, &dev_attr_atusb_id); | |
429 | if (retval) | |
430 | goto error; | |
431 | ||
432 | 414 | retval = device_create_file(&interface->dev, &dev_attr_rf_part_num); |
433 | 415 | if (retval) |
434 | 416 | goto error; |
... | ... | |
443 | 425 | error: |
444 | 426 | device_remove_file(&interface->dev, &dev_attr_rf_version_num); |
445 | 427 | device_remove_file(&interface->dev, &dev_attr_rf_part_num); |
446 | device_remove_file(&interface->dev, &dev_attr_atusb_id); | |
447 | 428 | spi_master_put(atusb->master); |
448 | 429 | kfree(atusb); |
449 | 430 | return retval; |
... | ... | |
460 | 441 | */ |
461 | 442 | device_remove_file(&interface->dev, &dev_attr_rf_version_num); |
462 | 443 | device_remove_file(&interface->dev, &dev_attr_rf_part_num); |
463 | device_remove_file(&interface->dev, &dev_attr_atusb_id); | |
464 | 444 | |
465 | 445 | usb_set_intfdata(interface, NULL); |
466 | 446 | usb_put_dev(atusb->udev); |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9