diff options
author | Alan Tull <atull@opensource.altera.com> | 2015-10-22 19:38:38 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-24 01:49:44 +0200 |
commit | 92d94a7ec552fafaa036fdb04d0894d6c444cafb (patch) | |
tree | fc240466f1bf3079934ba839c3b82656035b7e9f /drivers/fpga/fpga-mgr.c | |
parent | fpga manager: ensure lifetime with of_fpga_mgr_get (diff) | |
download | linux-92d94a7ec552fafaa036fdb04d0894d6c444cafb.tar.xz linux-92d94a7ec552fafaa036fdb04d0894d6c444cafb.zip |
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 <atull@opensource.altera.com>
Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
-rw-r--r-- | drivers/fpga/fpga-mgr.c | 12 |
1 files 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; |