From 92d94a7ec552fafaa036fdb04d0894d6c444cafb Mon Sep 17 00:00:00 2001 From: Alan Tull Date: Thu, 22 Oct 2015 12:38:38 -0500 Subject: [PATCH] fpga manager: remove unnecessary null pointer checks Remove unnecessary null pointer checks. We want the caller of these functions to do their own pointer checks. Add some comments to document this. Signed-off-by: Alan Tull Reviewed-by: Moritz Fischer Signed-off-by: Greg Kroah-Hartman --- drivers/fpga/fpga-mgr.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index 68d7b41159cb..a24f5cb877e0 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -38,7 +38,8 @@ static struct class *fpga_mgr_class; * * Step the low level fpga manager through the device-specific steps of getting * an FPGA ready to be configured, writing the image to it, then doing whatever - * post-configuration steps necessary. + * post-configuration steps necessary. This code assumes the caller got the + * mgr pointer from of_fpga_mgr_get() and checked that it is not an error code. * * Return: 0 on success, negative error code otherwise. */ @@ -48,9 +49,6 @@ int fpga_mgr_buf_load(struct fpga_manager *mgr, u32 flags, const char *buf, struct device *dev = &mgr->dev; int ret; - if (!mgr) - return -ENODEV; - /* * Call the low level driver's write_init function. This will do the * device-specific things to get the FPGA into the state where it is @@ -100,7 +98,8 @@ EXPORT_SYMBOL_GPL(fpga_mgr_buf_load); * * Request an FPGA image using the firmware class, then write out to the FPGA. * Update the state before each step to provide info on what step failed if - * there is a failure. + * there is a failure. This code assumes the caller got the mgr pointer + * from of_fpga_mgr_get() and checked that it is not an error code. * * Return: 0 on success, negative error code otherwise. */ @@ -111,9 +110,6 @@ int fpga_mgr_firmware_load(struct fpga_manager *mgr, u32 flags, const struct firmware *fw; int ret; - if (!mgr) - return -ENODEV; - dev_info(dev, "writing %s to %s\n", image_name, mgr->name); mgr->state = FPGA_MGR_STATE_FIRMWARE_REQ;