The patch titled Subject: i2c: style cleanups after idr_alloc() conversion has been removed from the -mm tree. Its filename was i2c-convert-to-idr_alloc-fix-fix.patch This patch was dropped because it was folded into i2c-convert-to-idr_alloc.patch ------------------------------------------------------ From: Tejun Heo <tj@xxxxxxxxxx> Subject: i2c: style cleanups after idr_alloc() conversion Style cleanups suggested by Wolfram. * s/res/id/ in i2c_add_numbered_adapter() so that it matches i2c_add_adapter(). * Add a blank line before return in i2c_add_numbered_adapter(). This patch is purely cosmetic. Signed-off-by: Tejun Heo <tj@xxxxxxxxxx> Cc: Wolfram Sang <wolfram@xxxxxxxxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Cc: Jean Delvare <khali@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/i2c/i2c-core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff -puN drivers/i2c/i2c-core.c~i2c-convert-to-idr_alloc-fix-fix drivers/i2c/i2c-core.c --- a/drivers/i2c/i2c-core.c~i2c-convert-to-idr_alloc-fix-fix +++ a/drivers/i2c/i2c-core.c @@ -935,16 +935,17 @@ out_list: */ int i2c_add_adapter(struct i2c_adapter *adapter) { - int res; + int id; mutex_lock(&core_lock); - res = idr_alloc(&i2c_adapter_idr, adapter, - __i2c_first_dynamic_bus_num, 0, GFP_KERNEL); + id = idr_alloc(&i2c_adapter_idr, adapter, + __i2c_first_dynamic_bus_num, 0, GFP_KERNEL); mutex_unlock(&core_lock); - if (res < 0) - return res; + if (id < 0) + return id; + + adapter->nr = id; - adapter->nr = res; return i2c_register_adapter(adapter); } EXPORT_SYMBOL(i2c_add_adapter); _ Patches currently in -mm which might be from tj@xxxxxxxxxx are origin.patch lib-devresc-fix-misplaced-endif.patch lib-scatterlist-add-simple-page-iterator.patch lib-scatterlist-use-page-iterator-in-the-mapping-iterator.patch lockdep-check-that-no-locks-held-at-freeze-time.patch coredump-use-a-freezable_schedule-for-the-coredump_finish-wait.patch idr-fix-a-subtle-bug-in-idr_get_next.patch idr-make-idr_destroy-imply-idr_remove_all.patch atm-nicstar-dont-use-idr_remove_all.patch block-loop-dont-use-idr_remove_all.patch firewire-dont-use-idr_remove_all.patch drm-dont-use-idr_remove_all.patch dm-dont-use-idr_remove_all.patch remoteproc-dont-use-idr_remove_all.patch rpmsg-dont-use-idr_remove_all.patch dlm-use-idr_for_each_entry-in-recover_idr_clear-error-path.patch dlm-dont-use-idr_remove_all.patch nfs-idr_destroy-no-longer-needs-idr_remove_all.patch inotify-dont-use-idr_remove_all.patch cgroup-dont-use-idr_remove_all.patch idr-deprecate-idr_remove_all.patch idr-cosmetic-updates-to-struct-initializer-definitions.patch idr-relocate-idr_for_each_entry-and-reorganize-id_get_new.patch idr-remove-_idr_rc_to_errno-hack.patch idr-refactor-idr_get_new_above.patch idr-implement-idr_preload-and-idr_alloc.patch block-fix-synchronization-and-limit-check-in-blk_alloc_devt.patch block-convert-to-idr_alloc.patch block-loop-convert-to-idr_alloc.patch atm-nicstar-convert-to-idr_alloc.patch drbd-convert-to-idr_alloc.patch dca-convert-to-idr_alloc.patch dmaengine-convert-to-idr_alloc.patch firewire-add-minor-number-range-check-to-fw_device_init.patch firewire-convert-to-idr_alloc.patch gpio-convert-to-idr_alloc.patch drm-convert-to-idr_alloc.patch drm-exynos-convert-to-idr_alloc.patch drm-i915-convert-to-idr_alloc.patch drm-sis-convert-to-idr_alloc.patch drm-via-convert-to-idr_alloc.patch drm-vmwgfx-convert-to-idr_alloc.patch i2c-convert-to-idr_alloc.patch ib-core-convert-to-idr_alloc.patch ib-amso1100-convert-to-idr_alloc.patch ib-cxgb3-convert-to-idr_alloc.patch ib-cxgb4-convert-to-idr_alloc.patch ib-ehca-convert-to-idr_alloc.patch ib-ipath-convert-to-idr_alloc.patch ib-ipath-convert-to-idr_alloc-fix.patch ib-mlx4-convert-to-idr_alloc.patch ib-ocrdma-convert-to-idr_alloc.patch ib-qib-convert-to-idr_alloc.patch dm-convert-to-idr_alloc.patch memstick-convert-to-idr_alloc.patch mfd-convert-to-idr_alloc.patch misc-c2port-convert-to-idr_alloc.patch misc-tifm_core-convert-to-idr_alloc.patch mmc-convert-to-idr_alloc.patch mtd-convert-to-idr_alloc.patch macvtap-convert-to-idr_alloc.patch ppp-convert-to-idr_alloc.patch power-convert-to-idr_alloc.patch pps-convert-to-idr_alloc.patch remoteproc-convert-to-idr_alloc.patch rpmsg-convert-to-idr_alloc.patch scsi-bfa-convert-to-idr_alloc.patch scsi-convert-to-idr_alloc.patch target-iscsi-convert-to-idr_alloc.patch scsi-lpfc-convert-to-idr_alloc.patch thermal-convert-to-idr_alloc.patch uio-convert-to-idr_alloc.patch vfio-convert-to-idr_alloc.patch dlm-convert-to-idr_alloc.patch inotify-convert-to-idr_alloc.patch ocfs2-convert-to-idr_alloc.patch ipc-convert-to-idr_alloc.patch ipc-convert-to-idr_alloc-fix.patch cgroup-convert-to-idr_alloc.patch events-convert-to-idr_alloc.patch posix-timers-convert-to-idr_alloc.patch net-9p-convert-to-idr_alloc.patch mac80211-convert-to-idr_alloc.patch sctp-convert-to-idr_alloc.patch nfs4client-convert-to-idr_alloc.patch idr-fix-top-layer-handling.patch idr-remove-max_idr_mask-and-move-left-max_idr_-into-idrc.patch idr-remove-length-restriction-from-idr_layer-bitmap.patch idr-remove-length-restriction-from-idr_layer-bitmap-checkpatch-fixes.patch idr-make-idr_layer-larger.patch idr-add-idr_layer-prefix.patch idr-implement-lookup-hint.patch idr-implement-lookup-hint-always-do-slow-path-when-hint-is-uninitialized.patch idr-explain-warn_on_once-on-negative-ids-out-of-range-id.patch hlist-drop-the-node-parameter-from-iterators-fix-fix-fix-fix.patch hlist-drop-the-node-parameter-from-iterators-fix-fix-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html