aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamiro Oliveira <Ramiro.Oliveira@synopsys.com>2016-09-30 10:01:21 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-02 11:29:11 -0400
commitf86a180868a92ae57da8a716ec72d5303ba8faaa (patch)
tree34b8da4bed102f5aa7783f666d95585cfc6931f3
parent37a7029b755b0b82c22a69880106d95ca66af0ba (diff)
Staging: fsl-mc: Fix unaligned * in block comments
Align the * in some block comments as reported by checkpatch. Signed-off-by: Ramiro Oliveira <roliveir@synopsys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/fsl-mc/bus/dpbp.c60
-rw-r--r--drivers/staging/fsl-mc/bus/dpmng.c60
-rw-r--r--drivers/staging/fsl-mc/bus/dprc.c88
-rw-r--r--drivers/staging/fsl-mc/bus/fsl-mc-bus.c4
-rw-r--r--drivers/staging/fsl-mc/include/dpbp-cmd.h60
5 files changed, 136 insertions, 136 deletions
diff --git a/drivers/staging/fsl-mc/bus/dpbp.c b/drivers/staging/fsl-mc/bus/dpbp.c
index fe271fbd629b..5d4cd812a400 100644
--- a/drivers/staging/fsl-mc/bus/dpbp.c
+++ b/drivers/staging/fsl-mc/bus/dpbp.c
@@ -1,34 +1,34 @@
1/* Copyright 2013-2016 Freescale Semiconductor Inc. 1/* Copyright 2013-2016 Freescale Semiconductor Inc.
2* 2 *
3* Redistribution and use in source and binary forms, with or without 3 * Redistribution and use in source and binary forms, with or without
4* modification, are permitted provided that the following conditions are met: 4 * modification, are permitted provided that the following conditions are met:
5* * Redistributions of source code must retain the above copyright 5 * * Redistributions of source code must retain the above copyright
6* notice, this list of conditions and the following disclaimer. 6 * notice, this list of conditions and the following disclaimer.
7* * Redistributions in binary form must reproduce the above copyright 7 * * Redistributions in binary form must reproduce the above copyright
8* notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer in the
9* documentation and/or other materials provided with the distribution. 9 * documentation and/or other materials provided with the distribution.
10* * Neither the name of the above-listed copyright holders nor the 10 * * Neither the name of the above-listed copyright holders nor the
11* names of any contributors may be used to endorse or promote products 11 * names of any contributors may be used to endorse or promote products
12* derived from this software without specific prior written permission. 12 * derived from this software without specific prior written permission.
13* 13 *
14* 14 *
15* ALTERNATIVELY, this software may be distributed under the terms of the 15 * ALTERNATIVELY, this software may be distributed under the terms of the
16* GNU General Public License ("GPL") as published by the Free Software 16 * GNU General Public License ("GPL") as published by the Free Software
17* Foundation, either version 2 of that License or (at your option) any 17 * Foundation, either version 2 of that License or (at your option) any
18* later version. 18 * later version.
19* 19 *
20* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE 23 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
24* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30* POSSIBILITY OF SUCH DAMAGE. 30 * POSSIBILITY OF SUCH DAMAGE.
31*/ 31 */
32#include "../include/mc-sys.h" 32#include "../include/mc-sys.h"
33#include "../include/mc-cmd.h" 33#include "../include/mc-cmd.h"
34#include "../include/dpbp.h" 34#include "../include/dpbp.h"
diff --git a/drivers/staging/fsl-mc/bus/dpmng.c b/drivers/staging/fsl-mc/bus/dpmng.c
index 669f604ada7c..96b1d67756fa 100644
--- a/drivers/staging/fsl-mc/bus/dpmng.c
+++ b/drivers/staging/fsl-mc/bus/dpmng.c
@@ -1,34 +1,34 @@
1/* Copyright 2013-2016 Freescale Semiconductor Inc. 1/* Copyright 2013-2016 Freescale Semiconductor Inc.
2* 2 *
3* Redistribution and use in source and binary forms, with or without 3 * Redistribution and use in source and binary forms, with or without
4* modification, are permitted provided that the following conditions are met: 4 * modification, are permitted provided that the following conditions are met:
5* * Redistributions of source code must retain the above copyright 5 * * Redistributions of source code must retain the above copyright
6* notice, this list of conditions and the following disclaimer. 6 * notice, this list of conditions and the following disclaimer.
7* * Redistributions in binary form must reproduce the above copyright 7 * * Redistributions in binary form must reproduce the above copyright
8* notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer in the
9* documentation and/or other materials provided with the distribution. 9 * documentation and/or other materials provided with the distribution.
10* * Neither the name of the above-listed copyright holders nor the 10 * * Neither the name of the above-listed copyright holders nor the
11* names of any contributors may be used to endorse or promote products 11 * names of any contributors may be used to endorse or promote products
12* derived from this software without specific prior written permission. 12 * derived from this software without specific prior written permission.
13* 13 *
14* 14 *
15* ALTERNATIVELY, this software may be distributed under the terms of the 15 * ALTERNATIVELY, this software may be distributed under the terms of the
16* GNU General Public License ("GPL") as published by the Free Software 16 * GNU General Public License ("GPL") as published by the Free Software
17* Foundation, either version 2 of that License or (at your option) any 17 * Foundation, either version 2 of that License or (at your option) any
18* later version. 18 * later version.
19* 19 *
20* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE 23 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
24* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30* POSSIBILITY OF SUCH DAMAGE. 30 * POSSIBILITY OF SUCH DAMAGE.
31*/ 31 */
32#include "../include/mc-sys.h" 32#include "../include/mc-sys.h"
33#include "../include/mc-cmd.h" 33#include "../include/mc-cmd.h"
34#include "../include/dpmng.h" 34#include "../include/dpmng.h"
diff --git a/drivers/staging/fsl-mc/bus/dprc.c b/drivers/staging/fsl-mc/bus/dprc.c
index ac4ed3517084..9fea3def6041 100644
--- a/drivers/staging/fsl-mc/bus/dprc.c
+++ b/drivers/staging/fsl-mc/bus/dprc.c
@@ -1,34 +1,34 @@
1/* Copyright 2013-2016 Freescale Semiconductor Inc. 1/* Copyright 2013-2016 Freescale Semiconductor Inc.
2* 2 *
3* Redistribution and use in source and binary forms, with or without 3 * Redistribution and use in source and binary forms, with or without
4* modification, are permitted provided that the following conditions are met: 4 * modification, are permitted provided that the following conditions are met:
5* * Redistributions of source code must retain the above copyright 5 * * Redistributions of source code must retain the above copyright
6* notice, this list of conditions and the following disclaimer. 6 * notice, this list of conditions and the following disclaimer.
7* * Redistributions in binary form must reproduce the above copyright 7 * * Redistributions in binary form must reproduce the above copyright
8* notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer in the
9* documentation and/or other materials provided with the distribution. 9 * documentation and/or other materials provided with the distribution.
10* * Neither the name of the above-listed copyright holders nor the 10 * * Neither the name of the above-listed copyright holders nor the
11* names of any contributors may be used to endorse or promote products 11 * names of any contributors may be used to endorse or promote products
12* derived from this software without specific prior written permission. 12 * derived from this software without specific prior written permission.
13* 13 *
14* 14 *
15* ALTERNATIVELY, this software may be distributed under the terms of the 15 * ALTERNATIVELY, this software may be distributed under the terms of the
16* GNU General Public License ("GPL") as published by the Free Software 16 * GNU General Public License ("GPL") as published by the Free Software
17* Foundation, either version 2 of that License or (at your option) any 17 * Foundation, either version 2 of that License or (at your option) any
18* later version. 18 * later version.
19* 19 *
20* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE 23 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
24* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30* POSSIBILITY OF SUCH DAMAGE. 30 * POSSIBILITY OF SUCH DAMAGE.
31*/ 31 */
32#include "../include/mc-sys.h" 32#include "../include/mc-sys.h"
33#include "../include/mc-cmd.h" 33#include "../include/mc-cmd.h"
34#include "../include/dprc.h" 34#include "../include/dprc.h"
@@ -1335,20 +1335,20 @@ int dprc_disconnect(struct fsl_mc_io *mc_io,
1335} 1335}
1336 1336
1337/** 1337/**
1338* dprc_get_connection() - Get connected endpoint and link status if connection 1338 * dprc_get_connection() - Get connected endpoint and link status if connection
1339* exists. 1339 * exists.
1340* @mc_io: Pointer to MC portal's I/O object 1340 * @mc_io: Pointer to MC portal's I/O object
1341* @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' 1341 * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_'
1342* @token: Token of DPRC object 1342 * @token: Token of DPRC object
1343* @endpoint1: Endpoint 1 configuration parameters 1343 * @endpoint1: Endpoint 1 configuration parameters
1344* @endpoint2: Returned endpoint 2 configuration parameters 1344 * @endpoint2: Returned endpoint 2 configuration parameters
1345* @state: Returned link state: 1345 * @state: Returned link state:
1346* 1 - link is up; 1346 * 1 - link is up;
1347* 0 - link is down; 1347 * 0 - link is down;
1348* -1 - no connection (endpoint2 information is irrelevant) 1348 * -1 - no connection (endpoint2 information is irrelevant)
1349* 1349 *
1350* Return: '0' on Success; -ENAVAIL if connection does not exist. 1350 * Return: '0' on Success; -ENAVAIL if connection does not exist.
1351*/ 1351 */
1352int dprc_get_connection(struct fsl_mc_io *mc_io, 1352int dprc_get_connection(struct fsl_mc_io *mc_io,
1353 u32 cmd_flags, 1353 u32 cmd_flags,
1354 u16 token, 1354 u16 token,
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c
index 3d687b51c9ff..4ebc72fb7704 100644
--- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c
+++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c
@@ -259,8 +259,8 @@ bool fsl_mc_bus_exists(void)
259EXPORT_SYMBOL_GPL(fsl_mc_bus_exists); 259EXPORT_SYMBOL_GPL(fsl_mc_bus_exists);
260 260
261/** 261/**
262* fsl_mc_get_root_dprc - function to traverse to the root dprc 262 * fsl_mc_get_root_dprc - function to traverse to the root dprc
263*/ 263 */
264void fsl_mc_get_root_dprc(struct device *dev, 264void fsl_mc_get_root_dprc(struct device *dev,
265 struct device **root_dprc_dev) 265 struct device **root_dprc_dev)
266{ 266{
diff --git a/drivers/staging/fsl-mc/include/dpbp-cmd.h b/drivers/staging/fsl-mc/include/dpbp-cmd.h
index 4828ccd0cffd..2860411ddb51 100644
--- a/drivers/staging/fsl-mc/include/dpbp-cmd.h
+++ b/drivers/staging/fsl-mc/include/dpbp-cmd.h
@@ -1,34 +1,34 @@
1/* Copyright 2013-2016 Freescale Semiconductor Inc. 1/* Copyright 2013-2016 Freescale Semiconductor Inc.
2* 2 *
3* Redistribution and use in source and binary forms, with or without 3 * Redistribution and use in source and binary forms, with or without
4* modification, are permitted provided that the following conditions are met: 4 * modification, are permitted provided that the following conditions are met:
5* * Redistributions of source code must retain the above copyright 5 * * Redistributions of source code must retain the above copyright
6* notice, this list of conditions and the following disclaimer. 6 * notice, this list of conditions and the following disclaimer.
7* * Redistributions in binary form must reproduce the above copyright 7 * * Redistributions in binary form must reproduce the above copyright
8* notice, this list of conditions and the following disclaimer in the 8 * notice, this list of conditions and the following disclaimer in the
9* documentation and/or other materials provided with the distribution. 9 * documentation and/or other materials provided with the distribution.
10* * Neither the name of the above-listed copyright holders nor the 10 * * Neither the name of the above-listed copyright holders nor the
11* names of any contributors may be used to endorse or promote products 11 * names of any contributors may be used to endorse or promote products
12* derived from this software without specific prior written permission. 12 * derived from this software without specific prior written permission.
13* 13 *
14* 14 *
15* ALTERNATIVELY, this software may be distributed under the terms of the 15 * ALTERNATIVELY, this software may be distributed under the terms of the
16* GNU General Public License ("GPL") as published by the Free Software 16 * GNU General Public License ("GPL") as published by the Free Software
17* Foundation, either version 2 of that License or (at your option) any 17 * Foundation, either version 2 of that License or (at your option) any
18* later version. 18 * later version.
19* 19 *
20* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE 23 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
24* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30* POSSIBILITY OF SUCH DAMAGE. 30 * POSSIBILITY OF SUCH DAMAGE.
31*/ 31 */
32#ifndef _FSL_DPBP_CMD_H 32#ifndef _FSL_DPBP_CMD_H
33#define _FSL_DPBP_CMD_H 33#define _FSL_DPBP_CMD_H
34 34