* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits) staging: et131x: Remove redundant check and return statement staging: et131x: Mainly whitespace changes to appease checkpatch staging: et131x: Remove last of the forward declarations staging: et131x: Remove even more forward declarations staging: et131x: Remove yet more forward declarations staging: et131x: Remove more forward declarations staging: et131x: Remove forward declaration of et131x_adapter_setup staging: et131x: Remove some forward declarations staging: et131x: Remove unused rx_ring.recv_packet_pool staging: et131x: Remove call to find pci pm capability staging: et131x: Remove redundant et131x_reset_recv() call staging: et131x: Remove unused rx_ring.recv_buffer_pool Staging: bcm: Fix three initialization errors in InterfaceDld.c Staging: bcm: Fix coding style issues in InterfaceDld.c staging:iio:dac: Add AD5360 driver staging:iio:trigger:bfin-timer: Fix compile error Staging: vt6655: add some range checks before memcpy() Staging: vt6655: whitespace fixes to iotcl.c Staging: vt6656: add some range checks before memcpy() Staging: vt6656: whitespace cleanups in ioctl.c ... Fix up conflicts in: - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}: vg driver movement - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}: driver removal vs now stale changes - drivers/staging/rtl8192e/r8192E_core.c: driver removal vs now stale changes - drivers/staging/et131x/et131*: driver consolidation into one file, tried to do fixups
Showing the changes to scripts (1 of 725 files). Show all
Unified · Split
| @@ -735,6 +735,27 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id, · 734 unmodified lines | |||
| 735 | return 1; | 735 | return 1; |
| 736 | } | 736 | } |
| 737 | 737 | ||
| 738 | /* | ||
| 739 | * Looks like: vmbus:guid | ||
| 740 | * Each byte of the guid will be represented by two hex characters | ||
| 741 | * in the name. | ||
| 742 | */ | ||
| 743 | |||
| 744 | static int do_vmbus_entry(const char *filename, struct hv_vmbus_device_id *id, | ||
| 745 | char *alias) | ||
| 746 | { | ||
| 747 | int i; | ||
| 748 | char guid_name[((sizeof(id->guid) + 1)) * 2]; | ||
| 749 | |||
| 750 | for (i = 0; i < (sizeof(id->guid) * 2); i += 2) | ||
| 751 | sprintf(&guid_name[i], "%02x", id->guid[i/2]); | ||
| 752 | |||
| 753 | strcpy(alias, "vmbus:"); | ||
| 754 | strcat(alias, guid_name); | ||
| 755 | |||
| 756 | return 1; | ||
| 757 | } | ||
| 758 | |||
| 738 | /* Looks like: i2c:S */ | 759 | /* Looks like: i2c:S */ |
| 739 | static int do_i2c_entry(const char *filename, struct i2c_device_id *id, | 760 | static int do_i2c_entry(const char *filename, struct i2c_device_id *id, |
| 740 | char *alias) | 761 | char *alias) |
| @@ -994,6 +1015,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, · 253 unmodified lines | |||
| 994 | do_table(symval, sym->st_size, | 1015 | do_table(symval, sym->st_size, |
| 995 | sizeof(struct virtio_device_id), "virtio", | 1016 | sizeof(struct virtio_device_id), "virtio", |
| 996 | do_virtio_entry, mod); | 1017 | do_virtio_entry, mod); |
| 1018 | else if (sym_is(symname, "__mod_vmbus_device_table")) | ||
| 1019 | do_table(symval, sym->st_size, | ||
| 1020 | sizeof(struct hv_vmbus_device_id), "vmbus", | ||
| 1021 | do_vmbus_entry, mod); | ||
| 997 | else if (sym_is(symname, "__mod_i2c_device_table")) | 1022 | else if (sym_is(symname, "__mod_i2c_device_table")) |
| 998 | do_table(symval, sym->st_size, | 1023 | do_table(symval, sym->st_size, |
| 999 | sizeof(struct i2c_device_id), "i2c", | 1024 | sizeof(struct i2c_device_id), "i2c", |