Reviewed-by: Kate Stewart <kstewart@xxxxxxxxxxxxxxxxxxx> On Mon, May 20, 2019 at 12:10 PM Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote: > > Based on 1 normalized pattern(s): > > this program is free software you can redistribute it and or modify > it under the terms of the gnu general public license as published by > the free software foundation either version 2 of the named license > or any later version 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 59 temple > place suite 330 boston ma 02111 1307 usa > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-or-later > > has been chosen to replace the boilerplate/reference in 7 file(s). > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: linux-spdx@xxxxxxxxxxxxxxx > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch2&id=5a6f88a6c50b > --- > drivers/video/fbdev/sis/initextlfb.c | 15 +-------------- > drivers/video/fbdev/sis/sis.h | 15 +-------------- > drivers/video/fbdev/sis/sis_accel.c | 15 +-------------- > drivers/video/fbdev/sis/sis_accel.h | 15 +-------------- > drivers/video/fbdev/sis/sis_main.c | 16 +--------------- > drivers/video/fbdev/sis/sis_main.h | 15 +-------------- > include/video/sisfb.h | 15 +-------------- > 7 files changed, 7 insertions(+), 99 deletions(-) > > --- a/drivers/video/fbdev/sis/initextlfb.c > +++ b/drivers/video/fbdev/sis/initextlfb.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * SiS 300/540/630[S]/730[S] > * SiS 315[E|PRO]/550/[M]65x/[M]66x[F|M|G]X/[M]74x[GX]/330/[M]76x[GX] > @@ -8,20 +9,6 @@ > * > * Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria. > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the named License, > - * or any later version. > - * > - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA > - * > * Author: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx> > */ > > --- a/drivers/video/fbdev/sis/sis.h > +++ b/drivers/video/fbdev/sis/sis.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * SiS 300/540/630[S]/730[S], > * SiS 315[E|PRO]/550/[M]65x/[M]661[F|M]X/740/[M]741[GX]/330/[M]76x[GX], > @@ -5,20 +6,6 @@ > * frame buffer driver for Linux kernels >=2.4.14 and >=2.6.3 > * > * Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the named License, > - * or any later version. > - * > - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA > */ > > #ifndef _SIS_H_ > --- a/drivers/video/fbdev/sis/sis_accel.c > +++ b/drivers/video/fbdev/sis/sis_accel.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * SiS 300/540/630[S]/730[S], > * SiS 315[E|PRO]/550/[M]650/651/[M]661[F|M]X/740/[M]741[GX]/330/[M]760[GX], > @@ -6,20 +7,6 @@ > * > * 2D acceleration part > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the named License, > - * or any later version. > - * > - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA > - * > * Based on the XFree86/X.org driver which is > * Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria > * > --- a/drivers/video/fbdev/sis/sis_accel.h > +++ b/drivers/video/fbdev/sis/sis_accel.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * SiS 300/540/630[S]/730[S], > * SiS 315[E|PRO]/550/[M]650/651/[M]661[F|M]X/740/[M]741[GX]/330/[M]760[GX], > @@ -6,20 +7,6 @@ > * > * 2D acceleration part > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the named License, > - * or any later version. > - * > - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA > - * > * Based on the X driver's sis300_accel.h which is > * Copyright (C) 2001-2004 by Thomas Winischhofer, Vienna, Austria > * and sis310_accel.h which is > --- a/drivers/video/fbdev/sis/sis_main.c > +++ b/drivers/video/fbdev/sis/sis_main.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * SiS 300/540/630[S]/730[S], > * SiS 315[E|PRO]/550/[M]65x/[M]66x[F|M|G]X/[M]74x[GX]/330/[M]76x[GX], > @@ -6,20 +7,6 @@ > * > * Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria. > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the named License, > - * or any later version. > - * > - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA > - * > * Author: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx> > * > * Author of (practically wiped) code base: > @@ -30,7 +17,6 @@ > * > * Originally based on the VBE 2.0 compliant graphic boards framebuffer driver, > * which is (c) 1998 Gerd Knorr <kraxel@xxxxxxxxxxxxxxxxxxxxx> > - * > */ > > #include <linux/module.h> > --- a/drivers/video/fbdev/sis/sis_main.h > +++ b/drivers/video/fbdev/sis/sis_main.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * SiS 300/305/540/630(S)/730(S), > * SiS 315[E|PRO]/550/[M]65x/[M]66x[F|M|G]X/[M]74x[GX]/330/[M]76x[GX], > @@ -5,20 +6,6 @@ > * frame buffer driver for Linux kernels >=2.4.14 and >=2.6.3 > * > * Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the named License, > - * or any later version. > - * > - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA > */ > > #ifndef _SISFB_MAIN > --- a/include/video/sisfb.h > +++ b/include/video/sisfb.h > @@ -1,21 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * sisfb.h - definitions for the SiS framebuffer driver > * > * Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the named License, > - * or any later version. > - * > - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA > */ > #ifndef _LINUX_SISFB_H_ > #define _LINUX_SISFB_H_ > > > >