From: David S. Miller Date: Mon, 23 Feb 2015 20:08:37 +0000 (-0500) Subject: Merge branch 'be2net-next' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5e3d31896b8762022d36c006c4e4433658fdd181;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'be2net-next' Sathya Perla says: ==================== be2net: patch set Hi Dave, the following patch set reduces code duplication in probe/pci-resume/eeh-resume and remove/pci-suspend/eeh-error and UE-error detect/recovery paths. New helper routines have been introduced for this purpose. Pls apply this set to the net-next tree. Thanks! Patch 1 refactors the alloc/free code of adapter struct's fields into a new set of helper routines -- be_drv_init/cleanup(). Patch 2 gets rid of the be_get_initial_config() routine as be_get_config() is the place holder for related code. Patch 3 introduces a new helper routine be_func_init() to execute the initialization code used in probe/pci-resume/eeh-resume to remove code duplication. Patch 4 introduces a wrapper for scheduling/canceling error detection task on similar lines to the be_worker task. Patch 5 refactors UE error detection and recovery code on similar lines to EEH code. Cleaning up resources is done in the error detection routine followed by error recovery. Patch 6 gets rid of the lancer_test_and_set_rdy_state() routine as the same code now available in be_func_init(). Patch 7 creates a new helper routine be_resume() for all the common code in be_probe(), be_pci_resume() and be_eeh_resume(), to reduce code duplication. Patch 8 creates a new helper routine be_cleanup() for all the common cleanup code duplicated in the suspend/EEH err detection paths. Patch 9 moves be_func_init() inside be_setup() as everytime be_setup() is called, the driver will have to wait for the function/FW to be be initialized. ==================== Signed-off-by: David S. Miller --- 5e3d31896b8762022d36c006c4e4433658fdd181