Hello, +Cc Sean Young <sean@xxxxxxxx> > -----Original Message----- > From: Cai,Huoqing <caihuoqing@xxxxxxxxx> > Sent: 2021年9月16日 10:00 > To: Cai,Huoqing > Cc: Mauro Carvalho Chehab; linux-media@xxxxxxxxxxxxxxx; linux- > kernel@xxxxxxxxxxxxxxx > Subject: [PATCH v2] media: dvb-core: Convert to SPDX identifier > > use SPDX-License-Identifier instead of a verbose license text > and remove verbose license text. > > Signed-off-by: Cai Huoqing <caihuoqing@xxxxxxxxx> > --- > v1->v2: Change license from GPL-2.0+ to LGPL-2.1-or-later > > drivers/media/dvb-core/dmxdev.c | 12 +----------- > drivers/media/dvb-core/dvb_demux.c | 12 +----------- > drivers/media/dvb-core/dvb_vb2.c | 4 ---- > drivers/media/dvb-core/dvbdev.c | 12 +----------- > 4 files changed, 3 insertions(+), 37 deletions(-) > > diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb- > core/dmxdev.c > index 5d5a48475a54..e94ae9427fdb 100644 > --- a/drivers/media/dvb-core/dmxdev.c > +++ b/drivers/media/dvb-core/dmxdev.c > @@ -1,19 +1,9 @@ > +// SPDX-License-Identifier: LGPL-2.1-or-later > /* > * dmxdev.c - DVB demultiplexer device > * > * Copyright (C) 2000 Ralph Metzler & Marcus Metzler > * for convergence integrated media GmbH > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public License > - * as published by the Free Software Foundation; either version 2.1 > - * of the License, or (at your option) 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. > - * > */ > > #define pr_fmt(fmt) "dmxdev: " fmt > diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb- > core/dvb_demux.c > index 5fde1d38b3e3..c7a145bfbc55 100644 > --- a/drivers/media/dvb-core/dvb_demux.c > +++ b/drivers/media/dvb-core/dvb_demux.c > @@ -1,20 +1,10 @@ > +// SPDX-License-Identifier: LGPL-2.1-or-later > /* > * dvb_demux.c - DVB kernel demux API > * > * Copyright (C) 2000-2001 Ralph Metzler <ralph@xxxxxxxxxxxxxx> > * & Marcus Metzler <marcus@xxxxxxxxxxxxxx> > * for convergence integrated media GmbH > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public License > - * as published by the Free Software Foundation; either version 2.1 > - * of the License, or (at your option) 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. > - * > */ > > #define pr_fmt(fmt) "dvb_demux: " fmt > diff --git a/drivers/media/dvb-core/dvb_vb2.c b/drivers/media/dvb- > core/dvb_vb2.c > index 6974f1731529..602bbc52bd22 100644 > --- a/drivers/media/dvb-core/dvb_vb2.c > +++ b/drivers/media/dvb-core/dvb_vb2.c > @@ -5,10 +5,6 @@ > * Copyright (C) 2015 Samsung Electronics > * > * Author: jh1009.sung@xxxxxxxxxxx > - * > - * 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. > */ > > #include <linux/err.h> > diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb- > core/dvbdev.c > index 795d9bfaba5c..d7c341bfcca1 100644 > --- a/drivers/media/dvb-core/dvbdev.c > +++ b/drivers/media/dvb-core/dvbdev.c > @@ -1,20 +1,10 @@ > +// SPDX-License-Identifier: LGPL-2.1-or-later > /* > * dvbdev.c > * > * Copyright (C) 2000 Ralph Metzler <ralph@xxxxxxxxxxxxxx> > * & Marcus Metzler <marcus@xxxxxxxxxxxxxx> > * for convergence integrated media GmbH > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public License > - * as published by the Free Software Foundation; either version 2.1 > - * of the License, or (at your option) 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. > - * > */ > > #define pr_fmt(fmt) "dvbdev: " fmt > -- > 2.25.1
