Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92d94a7e authored by Alan Tull's avatar Alan Tull Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlan Tull <atull@opensource.altera.com>
Reviewed-by: default avatarMoritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 654ba4cc

drivers/fpga/fpga-mgr.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -38,7 +38,8 @@ static struct class *fpga_mgr_class; 
 *

 *

 * Step the low level fpga manager through the device-specific steps of getting

 * 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

 * 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.

 * 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;

	struct device *dev = &mgr->dev;

	int ret;

	int ret;





	if (!mgr)

		return -ENODEV;



	/*

	/*

	 * Call the low level driver's write_init function.  This will do the

	 * 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

	 * 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.

 * 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

 * 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.

 * 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;

	const struct firmware *fw;

	int ret;

	int ret;





	if (!mgr)

		return -ENODEV;



	dev_info(dev, "writing %s to %s\n", image_name, mgr->name);

	dev_info(dev, "writing %s to %s\n", image_name, mgr->name);





	mgr->state = FPGA_MGR_STATE_FIRMWARE_REQ;

	mgr->state = FPGA_MGR_STATE_FIRMWARE_REQ;