Commit bef4c893 authored by Jackson Chui's avatar Jackson Chui Committed by Greg Kroah-Hartman
Browse files

staging: greybus: Replace gcam macros with direct dev log calls 



Reported by checkpatch:

CHECK: Macro argument 'gcam' may be better as '(gcam)' to avoid
precedence issues

Inline standard calls to 'dev_*' kernel logging functions, in favor
of 'gcam_*' macros, to clear up gcam-related logging.

Signed-off-by: default avatarJackson Chui <jacksonchui.qwerty@gmail.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/ZhRzWNiak1qOdJLL@jc-ubuntu-dev-korn-1


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e945c43d

drivers/staging/greybus/camera.c

+27 −31
Original line number Diff line number Diff line
@@ -180,10 +180,6 @@ static const struct gb_camera_fmt_info *gb_camera_get_format_info(u16 gb_fmt) 


#define GB_CAMERA_MAX_SETTINGS_SIZE	8192



#define gcam_dbg(gcam, format...)	dev_dbg(&gcam->bundle->dev, format)

#define gcam_info(gcam, format...)	dev_info(&gcam->bundle->dev, format)

#define gcam_err(gcam, format...)	dev_err(&gcam->bundle->dev, format)



static int gb_camera_operation_sync_flags(struct gb_connection *connection,

					  int type, unsigned int flags,

					  void *request, size_t request_size,
@@ -232,7 +228,7 @@ static int gb_camera_get_max_pkt_size(struct gb_camera *gcam, 


		fmt_info = gb_camera_get_format_info(cfg->format);

		if (!fmt_info) {

			gcam_err(gcam, "unsupported greybus image format: %d\n",

			dev_err(&gcam->bundle->dev, "unsupported greybus image format: %d\n",

				cfg->format);

			return -EIO;

		}
@@ -241,7 +237,7 @@ static int gb_camera_get_max_pkt_size(struct gb_camera *gcam, 
			pkt_size = le32_to_cpu(cfg->max_pkt_size);



			if (pkt_size == 0) {

				gcam_err(gcam,

				dev_err(&gcam->bundle->dev,

					"Stream %u: invalid zero maximum packet size\n",

					i);

				return -EIO;
@@ -250,7 +246,7 @@ static int gb_camera_get_max_pkt_size(struct gb_camera *gcam, 
			pkt_size = le16_to_cpu(cfg->width) * fmt_info->bpp / 8;



			if (pkt_size != le32_to_cpu(cfg->max_pkt_size)) {

				gcam_err(gcam,

				dev_err(&gcam->bundle->dev,

					"Stream %u: maximum packet size mismatch (%u/%u)\n",

					i, pkt_size, cfg->max_pkt_size);

				return -EIO;
@@ -275,12 +271,12 @@ static const int gb_camera_configure_streams_validate_response(struct gb_camera 


	/* Validate the returned response structure */

	if (resp->padding[0] || resp->padding[1]) {

		gcam_err(gcam, "response padding != 0\n");

		dev_err(&gcam->bundle->dev, "response padding != 0\n");

		return -EIO;

	}



	if (resp->num_streams > nstreams) {

		gcam_err(gcam, "got #streams %u > request %u\n",

		dev_err(&gcam->bundle->dev, "got #streams %u > request %u\n",

			resp->num_streams, nstreams);

		return -EIO;

	}
@@ -289,7 +285,7 @@ static const int gb_camera_configure_streams_validate_response(struct gb_camera 
		struct gb_camera_stream_config_response *cfg = &resp->config[i];



		if (cfg->padding) {

			gcam_err(gcam, "stream #%u padding != 0\n", i);

			dev_err(&gcam->bundle->dev, "stream #%u padding != 0\n", i);

			return -EIO;

		}

	}
@@ -340,7 +336,7 @@ static int gb_camera_set_power_mode(struct gb_camera *gcam, bool hs) 


	ret = gb_camera_set_intf_power_mode(gcam, intf->interface_id, hs);

	if (ret < 0) {

		gcam_err(gcam, "failed to set module interface to %s (%d)\n",

		dev_err(&gcam->bundle->dev, "failed to set module interface to %s (%d)\n",

			hs ? "HS" : "PWM", ret);

		return ret;

	}
@@ -348,7 +344,7 @@ static int gb_camera_set_power_mode(struct gb_camera *gcam, bool hs) 
	ret = gb_camera_set_intf_power_mode(gcam, svc->ap_intf_id, hs);

	if (ret < 0) {

		gb_camera_set_intf_power_mode(gcam, intf->interface_id, !hs);

		gcam_err(gcam, "failed to set AP interface to %s (%d)\n",

		dev_err(&gcam->bundle->dev, "failed to set AP interface to %s (%d)\n",

			hs ? "HS" : "PWM", ret);

		return ret;

	}
@@ -435,7 +431,7 @@ static int gb_camera_setup_data_connection(struct gb_camera *gcam, 
			   sizeof(csi_cfg),

			   GB_APB_REQUEST_CSI_TX_CONTROL, false);

	if (ret < 0) {

		gcam_err(gcam, "failed to start the CSI transmitter\n");

		dev_err(&gcam->bundle->dev, "failed to start the CSI transmitter\n");

		goto error_power;

	}
@@ -470,7 +466,7 @@ static void gb_camera_teardown_data_connection(struct gb_camera *gcam) 
			   GB_APB_REQUEST_CSI_TX_CONTROL, false);



	if (ret < 0)

		gcam_err(gcam, "failed to stop the CSI transmitter\n");

		dev_err(&gcam->bundle->dev, "failed to stop the CSI transmitter\n");



	/* Set the UniPro link to low speed mode. */

	gb_camera_set_power_mode(gcam, false);
@@ -507,7 +503,7 @@ static int gb_camera_capabilities(struct gb_camera *gcam, 
					     NULL, 0,

					     (void *)capabilities, size);

	if (ret)

		gcam_err(gcam, "failed to retrieve capabilities: %d\n", ret);

		dev_err(&gcam->bundle->dev, "failed to retrieve capabilities: %d\n", ret);



done:

	mutex_unlock(&gcam->mutex);
@@ -723,21 +719,21 @@ static int gb_camera_request_handler(struct gb_operation *op) 
	struct gb_message *request;



	if (op->type != GB_CAMERA_TYPE_METADATA) {

		gcam_err(gcam, "Unsupported unsolicited event: %u\n", op->type);

		dev_err(&gcam->bundle->dev, "Unsupported unsolicited event: %u\n", op->type);

		return -EINVAL;

	}



	request = op->request;



	if (request->payload_size < sizeof(*payload)) {

		gcam_err(gcam, "Wrong event size received (%zu < %zu)\n",

		dev_err(&gcam->bundle->dev, "Wrong event size received (%zu < %zu)\n",

			request->payload_size, sizeof(*payload));

		return -EINVAL;

	}



	payload = request->payload;



	gcam_dbg(gcam, "received metadata for request %u, frame %u, stream %u\n",

	dev_dbg(&gcam->bundle->dev, "received metadata for request %u, frame %u, stream %u\n",

		payload->request_id, payload->frame_number, payload->stream);



	return 0;
@@ -1347,14 +1343,14 @@ static int gb_camera_resume(struct device *dev) 


	ret = gb_connection_enable(gcam->connection);

	if (ret) {

		gcam_err(gcam, "failed to enable connection: %d\n", ret);

		dev_err(&gcam->bundle->dev, "failed to enable connection: %d\n", ret);

		return ret;

	}



	if (gcam->data_connection) {

		ret = gb_connection_enable(gcam->data_connection);

		if (ret) {

			gcam_err(gcam,

			dev_err(&gcam->bundle->dev,

				"failed to enable data connection: %d\n", ret);

			return ret;

		}