From: H Hartley Sweeten Date: Wed, 12 Jun 2013 23:04:45 +0000 (-0700) Subject: staging: comedi: addi_apci_3xxx: absorb apci3xxx_reset() X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~76^2~157 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e72c7a50709e60663217704b30501bf34afa448;p=pandora-kernel.git staging: comedi: addi_apci_3xxx: absorb apci3xxx_reset() All the boards supported by this driver use the same 'reset' callback in the boardinfo. Absorb the reset function, apci3xxx_reset(), from hwdrv_apci3xxx.c directly into the driver. Remove i_ADDI_Reset(), which indirectly called the reset function, and just call apci3xx_reset() directly. Remove the 'reset' callback from the boardinfo. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed