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

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

Merge "qseecom: fix macro QSEECOM_ALIGN definition issue"

parents 88f0b764 9be14930

drivers/media/platform/msm/dvb/demux/mpq_sdmx.c

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

/* Copyright (c) 2013-2016, 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
@@ -22,10 +22,6 @@ static struct qseecom_handle *sdmx_qseecom_handles[SDMX_MAX_SESSIONS]; 
static struct mutex sdmx_lock[SDMX_MAX_SESSIONS];



#define QSEECOM_SBUFF_SIZE	SZ_128K

#define QSEECOM_ALIGN_SIZE	0x40

#define QSEECOM_ALIGN_MASK	(QSEECOM_ALIGN_SIZE - 1)

#define QSEECOM_ALIGN(x)	\

	((x + QSEECOM_ALIGN_SIZE) & (~QSEECOM_ALIGN_MASK))



enum sdmx_cmd_id {

	SDMX_OPEN_SESSION_CMD,

drivers/misc/hdcp.c

+0 −6
Original line number Diff line number Diff line
@@ -92,12 +92,6 @@ 
 */

#define SLEEP_SET_HW_KEY_MS 300





#define QSEECOM_ALIGN_SIZE    0x40

#define QSEECOM_ALIGN_MASK    (QSEECOM_ALIGN_SIZE - 1)

#define QSEECOM_ALIGN(x)\

	((x + QSEECOM_ALIGN_SIZE) & (~QSEECOM_ALIGN_MASK))



/* hdcp command status */

#define HDCP_SUCCESS      0

drivers/misc/qseecom_kernel.h

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

/* Copyright (c) 2012-2013, 2016, 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
@@ -18,7 +18,7 @@ 
#define QSEECOM_ALIGN_SIZE	0x40

#define QSEECOM_ALIGN_MASK	(QSEECOM_ALIGN_SIZE - 1)

#define QSEECOM_ALIGN(x)	\

	((x + QSEECOM_ALIGN_SIZE) & (~QSEECOM_ALIGN_MASK))

	((x + QSEECOM_ALIGN_MASK) & (~QSEECOM_ALIGN_MASK))



/*

 * struct qseecom_handle -