lkml.org 
[lkml]   [2019]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[char-misc 2/5] mei: convert to SPDX license tags
    Date
    Replace boiler plate licenses texts with the SPDX license
    identifiers in the mei files header.

    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    ---
    drivers/misc/mei/bus-fixup.c | 12 +------
    drivers/misc/mei/bus.c | 11 +-----
    drivers/misc/mei/client.c | 12 +------
    drivers/misc/mei/client.h | 12 +------
    drivers/misc/mei/debugfs.c | 13 ++-----
    drivers/misc/mei/hbm.c | 13 +------
    drivers/misc/mei/hbm.h | 12 +------
    drivers/misc/mei/hw-me-regs.h | 66 ++--------------------------------
    drivers/misc/mei/hw-me.c | 12 +------
    drivers/misc/mei/hw-me.h | 14 +-------
    drivers/misc/mei/hw-txe-regs.h | 61 ++-----------------------------
    drivers/misc/mei/hw-txe.c | 12 +------
    drivers/misc/mei/hw-txe.h | 12 +------
    drivers/misc/mei/hw.h | 12 +------
    drivers/misc/mei/init.c | 12 +------
    drivers/misc/mei/interrupt.c | 13 +------
    drivers/misc/mei/main.c | 13 ++-----
    drivers/misc/mei/mei-trace.c | 12 +------
    drivers/misc/mei/mei-trace.h | 12 +------
    drivers/misc/mei/mei_dev.h | 12 +------
    drivers/misc/mei/pci-me.c | 13 ++-----
    drivers/misc/mei/pci-txe.c | 12 +------
    include/uapi/linux/mei.h | 65 ++-------------------------------
    23 files changed, 31 insertions(+), 407 deletions(-)

    diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c
    index 5fcac02233af..c839bdf453d8 100644
    --- a/drivers/misc/mei/bus-fixup.c
    +++ b/drivers/misc/mei/bus-fixup.c
    @@ -1,17 +1,7 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2018, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #include <linux/kernel.h>
    diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
    index 65bec998eb6e..e6788fbd611c 100644
    --- a/drivers/misc/mei/bus.c
    +++ b/drivers/misc/mei/bus.c
    @@ -1,16 +1,7 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2012-2013, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #include <linux/module.h>
    diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
    index ca4c9cc218a2..306b5fdeaf9c 100644
    --- a/drivers/misc/mei/client.c
    +++ b/drivers/misc/mei/client.c
    @@ -1,17 +1,7 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2012, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #include <linux/sched/signal.h>
    diff --git a/drivers/misc/mei/client.h b/drivers/misc/mei/client.h
    index 64e318f589b4..a0e2ec2ed7ab 100644
    --- a/drivers/misc/mei/client.h
    +++ b/drivers/misc/mei/client.h
    @@ -1,17 +1,7 @@
    +/* SPDX-License-Identifier: GPL-2.0 */
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2012, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #ifndef _MEI_CLIENT_H_
    diff --git a/drivers/misc/mei/debugfs.c b/drivers/misc/mei/debugfs.c
    index 7b5df8fd6c5a..3b2dd5a1be06 100644
    --- a/drivers/misc/mei/debugfs.c
    +++ b/drivers/misc/mei/debugfs.c
    @@ -1,18 +1,9 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2012-2013, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */
    +
    #include <linux/slab.h>
    #include <linux/kernel.h>
    #include <linux/device.h>
    diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
    index e6207f614816..dfc21787d978 100644
    --- a/drivers/misc/mei/hbm.c
    +++ b/drivers/misc/mei/hbm.c
    @@ -1,19 +1,8 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2012, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */
    -
    #include <linux/export.h>
    #include <linux/sched.h>
    #include <linux/wait.h>
    diff --git a/drivers/misc/mei/hbm.h b/drivers/misc/mei/hbm.h
    index 0171a7e79bab..1e33359f27f0 100644
    --- a/drivers/misc/mei/hbm.h
    +++ b/drivers/misc/mei/hbm.h
    @@ -1,17 +1,7 @@
    +/* SPDX-License-Identifier: GPL-2.0 */
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2012, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #ifndef _MEI_HBM_H_
    diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
    index bb1ee9834a02..535eb63a9dee 100644
    --- a/drivers/misc/mei/hw-me-regs.h
    +++ b/drivers/misc/mei/hw-me-regs.h
    @@ -1,68 +1,8 @@
    -/******************************************************************************
    +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
    +/*
    * Intel Management Engine Interface (Intel MEI) Linux driver
    - * Intel MEI Interface Header
    - *
    - * This file is provided under a dual BSD/GPLv2 license. When using or
    - * redistributing this file, you may do so under either license.
    - *
    - * GPL LICENSE SUMMARY
    - *
    - * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
    - *
    - * This program is free software; you can redistribute it and/or modify
    - * it under the terms of version 2 of the GNU General Public License as
    - * published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope that it will be useful, but
    - * WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    - * General Public License for more details.
    - *
    - * You should have received a copy of the GNU General Public License
    - * along with this program; if not, write to the Free Software
    - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
    - * USA
    - *
    - * The full GNU General Public License is included in this distribution
    - * in the file called LICENSE.GPL.
    - *
    - * Contact Information:
    - * Intel Corporation.
    - * linux-mei@linux.intel.com
    - * http://www.intel.com
    - *
    - * BSD LICENSE
    - *
    * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
    - * All rights reserved.
    - *
    - * Redistribution and use in source and binary forms, with or without
    - * modification, are permitted provided that the following conditions
    - * are met:
    - *
    - * * Redistributions of source code must retain the above copyright
    - * notice, this list of conditions and the following disclaimer.
    - * * Redistributions in binary form must reproduce the above copyright
    - * notice, this list of conditions and the following disclaimer in
    - * the documentation and/or other materials provided with the
    - * distribution.
    - * * Neither the name Intel Corporation nor the names of its
    - * contributors may be used to endorse or promote products derived
    - * from this software without specific prior written permission.
    - *
    - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
    - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
    - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    - *
    - *****************************************************************************/
    + */
    #ifndef _MEI_HW_MEI_REGS_H_
    #define _MEI_HW_MEI_REGS_H_

    diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
    index 3fbbadfa2ae1..ea1cd7043323 100644
    --- a/drivers/misc/mei/hw-me.c
    +++ b/drivers/misc/mei/hw-me.c
    @@ -1,17 +1,7 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2012, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #include <linux/pci.h>
    diff --git a/drivers/misc/mei/hw-me.h b/drivers/misc/mei/hw-me.h
    index bbcc5fc106cd..e1c1b4e18f3c 100644
    --- a/drivers/misc/mei/hw-me.h
    +++ b/drivers/misc/mei/hw-me.h
    @@ -1,21 +1,9 @@
    +/* SPDX-License-Identifier: GPL-2.0 */
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2012, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    -
    -
    #ifndef _MEI_INTERFACE_H_
    #define _MEI_INTERFACE_H_

    diff --git a/drivers/misc/mei/hw-txe-regs.h b/drivers/misc/mei/hw-txe-regs.h
    index f19229c4e655..d71798cb6272 100644
    --- a/drivers/misc/mei/hw-txe-regs.h
    +++ b/drivers/misc/mei/hw-txe-regs.h
    @@ -1,63 +1,8 @@
    -/******************************************************************************
    +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
    +/*
    * Intel Management Engine Interface (Intel MEI) Linux driver
    - * Intel MEI Interface Header
    - *
    - * This file is provided under a dual BSD/GPLv2 license. When using or
    - * redistributing this file, you may do so under either license.
    - *
    - * GPL LICENSE SUMMARY
    - *
    * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
    - *
    - * This program is free software; you can redistribute it and/or modify
    - * it under the terms of version 2 of the GNU General Public License as
    - * published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope that it will be useful, but
    - * WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    - * General Public License for more details.
    - *
    - * The full GNU General Public License is included in this distribution
    - * in the file called COPYING
    - *
    - * Contact Information:
    - * Intel Corporation.
    - * linux-mei@linux.intel.com
    - * http://www.intel.com
    - *
    - * BSD LICENSE
    - *
    - * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
    - * All rights reserved.
    - *
    - * Redistribution and use in source and binary forms, with or without
    - * modification, are permitted provided that the following conditions
    - * are met:
    - *
    - * * Redistributions of source code must retain the above copyright
    - * notice, this list of conditions and the following disclaimer.
    - * * Redistributions in binary form must reproduce the above copyright
    - * notice, this list of conditions and the following disclaimer in
    - * the documentation and/or other materials provided with the
    - * distribution.
    - * * Neither the name Intel Corporation nor the names of its
    - * contributors may be used to endorse or promote products derived
    - * from this software without specific prior written permission.
    - *
    - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
    - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
    - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    - *
    - *****************************************************************************/
    + */
    #ifndef _MEI_HW_TXE_REGS_H_
    #define _MEI_HW_TXE_REGS_H_

    diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c
    index 8449fe0367ff..c99a5360df27 100644
    --- a/drivers/misc/mei/hw-txe.c
    +++ b/drivers/misc/mei/hw-txe.c
    @@ -1,17 +1,7 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2013-2014, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #include <linux/pci.h>
    diff --git a/drivers/misc/mei/hw-txe.h b/drivers/misc/mei/hw-txe.h
    index e1e8b66d7648..b82dd5cb4a78 100644
    --- a/drivers/misc/mei/hw-txe.h
    +++ b/drivers/misc/mei/hw-txe.h
    @@ -1,17 +1,7 @@
    +/* SPDX-License-Identifier: GPL-2.0 */
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2013-2014, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #ifndef _MEI_HW_TXE_H_
    diff --git a/drivers/misc/mei/hw.h b/drivers/misc/mei/hw.h
    index b7d2487b8409..a4c16eaad1fb 100644
    --- a/drivers/misc/mei/hw.h
    +++ b/drivers/misc/mei/hw.h
    @@ -1,17 +1,7 @@
    +/* SPDX-License-Identifier: GPL-2.0 */
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2012, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #ifndef _MEI_HW_TYPES_H_
    diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
    index eb026e2a0537..0d719f3b941f 100644
    --- a/drivers/misc/mei/init.c
    +++ b/drivers/misc/mei/init.c
    @@ -1,17 +1,7 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2012, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #include <linux/export.h>
    diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
    index 055c2d89b310..5385293b973e 100644
    --- a/drivers/misc/mei/interrupt.c
    +++ b/drivers/misc/mei/interrupt.c
    @@ -1,20 +1,9 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2012, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    -
    #include <linux/export.h>
    #include <linux/kthread.h>
    #include <linux/interrupt.h>
    diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
    index 87281b3695e6..e796f149b6a5 100644
    --- a/drivers/misc/mei/main.c
    +++ b/drivers/misc/mei/main.c
    @@ -1,18 +1,9 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2018, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */
    +
    #include <linux/module.h>
    #include <linux/moduleparam.h>
    #include <linux/kernel.h>
    diff --git a/drivers/misc/mei/mei-trace.c b/drivers/misc/mei/mei-trace.c
    index 374edde72a14..32ee5d3d856c 100644
    --- a/drivers/misc/mei/mei-trace.c
    +++ b/drivers/misc/mei/mei-trace.c
    @@ -1,17 +1,7 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2015, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */
    #include <linux/module.h>

    diff --git a/drivers/misc/mei/mei-trace.h b/drivers/misc/mei/mei-trace.h
    index b52e9b97a7c0..9883bd8ece26 100644
    --- a/drivers/misc/mei/mei-trace.h
    +++ b/drivers/misc/mei/mei-trace.h
    @@ -1,17 +1,7 @@
    +/* SPDX-License-Identifier: GPL-2.0 */
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2015, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #if !defined(_MEI_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
    diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
    index 685b78ce30a5..3b45f12229e0 100644
    --- a/drivers/misc/mei/mei_dev.h
    +++ b/drivers/misc/mei/mei_dev.h
    @@ -1,17 +1,7 @@
    +/* SPDX-License-Identifier: GPL-2.0 */
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2018, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #ifndef _MEI_DEV_H_
    diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
    index 3ab946ad3257..723f9a8fb53d 100644
    --- a/drivers/misc/mei/pci-me.c
    +++ b/drivers/misc/mei/pci-me.c
    @@ -1,18 +1,9 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2003-2012, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */
    +
    #include <linux/module.h>
    #include <linux/moduleparam.h>
    #include <linux/kernel.h>
    diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c
    index e1b909123fb0..1e3dd806c483 100644
    --- a/drivers/misc/mei/pci-txe.c
    +++ b/drivers/misc/mei/pci-txe.c
    @@ -1,17 +1,7 @@
    +// SPDX-License-Identifier: GPL-2.0
    /*
    - *
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Copyright (c) 2013-2014, Intel Corporation.
    - *
    - * This program is free software; you can redistribute it and/or modify it
    - * under the terms and conditions of the GNU General Public License,
    - * version 2, as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope it will be useful, but WITHOUT
    - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
    - * more details.
    - *
    */

    #include <linux/module.h>
    diff --git a/include/uapi/linux/mei.h b/include/uapi/linux/mei.h
    index 0f681cbd38d3..1b932cad61b4 100644
    --- a/include/uapi/linux/mei.h
    +++ b/include/uapi/linux/mei.h
    @@ -1,70 +1,9 @@
    /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
    -/******************************************************************************
    +/*
    * Intel Management Engine Interface (Intel MEI) Linux driver
    * Intel MEI Interface Header
    - *
    - * This file is provided under a dual BSD/GPLv2 license. When using or
    - * redistributing this file, you may do so under either license.
    - *
    - * GPL LICENSE SUMMARY
    - *
    - * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
    - *
    - * This program is free software; you can redistribute it and/or modify
    - * it under the terms of version 2 of the GNU General Public License as
    - * published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope that it will be useful, but
    - * WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    - * General Public License for more details.
    - *
    - * You should have received a copy of the GNU General Public License
    - * along with this program; if not, write to the Free Software
    - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
    - * USA
    - *
    - * The full GNU General Public License is included in this distribution
    - * in the file called LICENSE.GPL.
    - *
    - * Contact Information:
    - * Intel Corporation.
    - * linux-mei@linux.intel.com
    - * http://www.intel.com
    - *
    - * BSD LICENSE
    - *
    * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
    - * All rights reserved.
    - *
    - * Redistribution and use in source and binary forms, with or without
    - * modification, are permitted provided that the following conditions
    - * are met:
    - *
    - * * Redistributions of source code must retain the above copyright
    - * notice, this list of conditions and the following disclaimer.
    - * * Redistributions in binary form must reproduce the above copyright
    - * notice, this list of conditions and the following disclaimer in
    - * the documentation and/or other materials provided with the
    - * distribution.
    - * * Neither the name Intel Corporation nor the names of its
    - * contributors may be used to endorse or promote products derived
    - * from this software without specific prior written permission.
    - *
    - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
    - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
    - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    - *
    - *****************************************************************************/
    -
    + */
    #ifndef _LINUX_MEI_H
    #define _LINUX_MEI_H

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-03-11 22:19    [W:6.174 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site