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

Commit 78ac0de1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "driver : Fix warnings and errors with llvm" into kernel.lnx.4.9.r27-rel

parents ded3b08e 653763b6

drivers/clk/msm/clock-cpu-8939.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2016, 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2016, 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1081,7 +1081,7 @@ static int __init cpu_clock_a53_init_little(void) 


	/* Wait for update to take effect */

	for (count = 500; count > 0; count--) {

		if (!(readl_relaxed(base)) & BIT(0))

		if (!(readl_relaxed(base) & BIT(0)))

			break;

		udelay(1);

	}

drivers/clk/msm/clock-cpu-sdm632.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1104,7 +1104,7 @@ static int __init cpu_clock_init(void) 


	/* Wait for update to take effect */

	for (count = 500; count > 0; count--) {

		if (!(readl_relaxed(base)) & BIT(0))

		if (!(readl_relaxed(base) & BIT(0)))

			break;

		udelay(1);

	}

drivers/media/platform/msm/camera_v2/common/cam_soc_api.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -208,7 +208,7 @@ int msm_camera_get_clk_info(struct platform_device *pdev, 
{

	int rc = 0;



	if (!pdev || !&pdev->dev || !clk_info || !clk_ptr || !num_clk)

	if (!pdev || (&pdev->dev == NULL) || !clk_info || !clk_ptr || !num_clk)

		return -EINVAL;



	rc = msm_camera_get_clk_info_internal(&pdev->dev,
@@ -513,7 +513,7 @@ int msm_camera_put_clk_info(struct platform_device *pdev, 
{

	int rc = 0;



	if (!pdev || !&pdev->dev || !clk_info || !clk_ptr)

	if (!pdev || (&pdev->dev == NULL) || !clk_info || !clk_ptr)

		return -EINVAL;



	rc = msm_camera_put_clk_info_internal(&pdev->dev,

drivers/media/platform/msm/camera_v2/msm.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -636,7 +636,7 @@ static inline int __msm_remove_session_cmd_ack_q(void *d1, void *d2) 
{

	struct msm_command_ack *cmd_ack = d1;



	if (!(&cmd_ack->command_q))

	if (&cmd_ack->command_q == NULL)

		return 0;



	msm_queue_drain(&cmd_ack->command_q, struct msm_command, list);
@@ -646,7 +646,7 @@ static inline int __msm_remove_session_cmd_ack_q(void *d1, void *d2) 


static void msm_remove_session_cmd_ack_q(struct msm_session *session)

{

	if ((!session) || !(&session->command_ack_q))

	if ((!session) || (&session->command_ack_q == NULL))

		return;



	mutex_lock(&session->lock);

drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c

+2 −1
Original line number Diff line number Diff line
@@ -389,7 +389,8 @@ static int32_t msm_flash_i2c_release( 
{

	int32_t rc = 0;



	if (!(&flash_ctrl->power_info) || !(&flash_ctrl->flash_i2c_client)) {

	if ((&flash_ctrl->power_info == NULL) ||

		(&flash_ctrl->flash_i2c_client == NULL)) {

		pr_err("%s:%d failed: %pK %pK\n",

			__func__, __LINE__, &flash_ctrl->power_info,

			&flash_ctrl->flash_i2c_client);