On Wed, 2018-07-25 at 17:39 +0300, Andy Shevchenko wrote: > Replace short statement in comment with proper SPDX license tag. > > Note, for i2c-desingware-slave.c the identifier is chosen > in accordance with MODULE_LICENSE() macro since it is visible to user. > Another point to this choice is that the header seems to be > copy'n'paste > from the other file of this very driver. > Cc: Luis > Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> > --- > drivers/i2c/busses/i2c-designware-baytrail.c | 10 +--------- > drivers/i2c/busses/i2c-designware-common.c | 15 +-------------- > drivers/i2c/busses/i2c-designware-core.h | 15 +-------------- > drivers/i2c/busses/i2c-designware-master.c | 15 +-------------- > drivers/i2c/busses/i2c-designware-pcidrv.c | 16 +--------------- > drivers/i2c/busses/i2c-designware-platdrv.c | 15 +-------------- > drivers/i2c/busses/i2c-designware-slave.c | 15 +-------------- > 7 files changed, 7 insertions(+), 94 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-designware-baytrail.c > b/drivers/i2c/busses/i2c-designware-baytrail.c > index dbda8c9c8a1c..a2a275cfc1f6 100644 > --- a/drivers/i2c/busses/i2c-designware-baytrail.c > +++ b/drivers/i2c/busses/i2c-designware-baytrail.c > @@ -1,15 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Intel BayTrail PMIC I2C bus semaphore implementaion > * Copyright (c) 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/delay.h> > #include <linux/device.h> > diff --git a/drivers/i2c/busses/i2c-designware-common.c > b/drivers/i2c/busses/i2c-designware-common.c > index bcc1bcbf0350..e67d6c7d552c 100644 > --- a/drivers/i2c/busses/i2c-designware-common.c > +++ b/drivers/i2c/busses/i2c-designware-common.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Synopsys DesignWare I2C adapter driver. > * > @@ -6,20 +7,6 @@ > * Copyright (C) 2006 Texas Instruments. > * Copyright (C) 2007 MontaVista Software Inc. > * Copyright (C) 2009 Provigent Ltd. > - * > - * ------------------------------------------------------------------ > ---------- > - * > - * 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 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. > - * ------------------------------------------------------------------ > ---------- > - * > */ > #include <linux/clk.h> > #include <linux/delay.h> > diff --git a/drivers/i2c/busses/i2c-designware-core.h > b/drivers/i2c/busses/i2c-designware-core.h > index cdba58a3e359..70c188d6fb6b 100644 > --- a/drivers/i2c/busses/i2c-designware-core.h > +++ b/drivers/i2c/busses/i2c-designware-core.h > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Synopsys DesignWare I2C adapter driver. > * > @@ -6,20 +7,6 @@ > * Copyright (C) 2006 Texas Instruments. > * Copyright (C) 2007 MontaVista Software Inc. > * Copyright (C) 2009 Provigent Ltd. > - * > - * ------------------------------------------------------------------ > ---------- > - * > - * 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 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. > - * ------------------------------------------------------------------ > ---------- > - * > */ > > #include <linux/i2c.h> > diff --git a/drivers/i2c/busses/i2c-designware-master.c > b/drivers/i2c/busses/i2c-designware-master.c > index 690eb607eda8..27b7d6c9527f 100644 > --- a/drivers/i2c/busses/i2c-designware-master.c > +++ b/drivers/i2c/busses/i2c-designware-master.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Synopsys DesignWare I2C adapter driver (master only). > * > @@ -6,20 +7,6 @@ > * Copyright (C) 2006 Texas Instruments. > * Copyright (C) 2007 MontaVista Software Inc. > * Copyright (C) 2009 Provigent Ltd. > - * > - * ------------------------------------------------------------------ > ---------- > - * > - * 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 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. > - * ------------------------------------------------------------------ > ---------- > - * > */ > #include <linux/delay.h> > #include <linux/err.h> > diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c > b/drivers/i2c/busses/i2c-designware-pcidrv.c > index b4997be62f03..dd550188948c 100644 > --- a/drivers/i2c/busses/i2c-designware-pcidrv.c > +++ b/drivers/i2c/busses/i2c-designware-pcidrv.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Synopsys DesignWare I2C adapter driver (master only). > * > @@ -7,22 +8,7 @@ > * Copyright (C) 2007 MontaVista Software Inc. > * Copyright (C) 2009 Provigent Ltd. > * Copyright (C) 2011, 2015, 2016 Intel Corporation. > - * > - * ------------------------------------------------------------------ > ---------- > - * > - * 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 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. > - * ------------------------------------------------------------------ > ---------- > - * > */ > - > #include <linux/acpi.h> > #include <linux/delay.h> > #include <linux/err.h> > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c > b/drivers/i2c/busses/i2c-designware-platdrv.c > index fc1462601b16..ddf13527aaee 100644 > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Synopsys DesignWare I2C adapter driver. > * > @@ -6,20 +7,6 @@ > * Copyright (C) 2006 Texas Instruments. > * Copyright (C) 2007 MontaVista Software Inc. > * Copyright (C) 2009 Provigent Ltd. > - * > - * ------------------------------------------------------------------ > ---------- > - * > - * 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 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. > - * ------------------------------------------------------------------ > ---------- > - * > */ > #include <linux/acpi.h> > #include <linux/clk-provider.h> > diff --git a/drivers/i2c/busses/i2c-designware-slave.c > b/drivers/i2c/busses/i2c-designware-slave.c > index 8af4c978938e..e7f9305b2dd9 100644 > --- a/drivers/i2c/busses/i2c-designware-slave.c > +++ b/drivers/i2c/busses/i2c-designware-slave.c > @@ -1,23 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Synopsys DesignWare I2C adapter driver (slave only). > * > * Based on the Synopsys DesignWare I2C adapter driver (master). > * > * Copyright (C) 2016 Synopsys Inc. > - * > - * ------------------------------------------------------------------ > ---------- > - * > - * 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 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. > - * ------------------------------------------------------------------ > ---------- > - * > */ > #include <linux/delay.h> > #include <linux/err.h> -- Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Intel Finland Oy
