Commit e9a7f025 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: remove outdated copyright print/module statement 



Remove the outdated copyright, don't print it, and update the
module author to actually be Intel, not Intel's copyright.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200425130140.dc86a4e9451a.Ice2e21b6427a4b57f953dba9ceb5b8b96b251a8c@changeid
parent 3d1d87ab

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 


#define DRV_DESCRIPTION	"Intel(R) Wireless WiFi Link AGN driver for Linux"

MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);

MODULE_AUTHOR(DRV_AUTHOR);

MODULE_LICENSE("GPL");



/* Please keep this array *SORTED* by hex value.

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+1 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 


#define DRV_DESCRIPTION	"Intel(R) Wireless WiFi driver for Linux"

MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);

MODULE_AUTHOR(DRV_AUTHOR);

MODULE_LICENSE("GPL");



#ifdef CONFIG_IWLWIFI_DEBUGFS
@@ -1774,7 +1774,6 @@ static int __init iwl_drv_init(void) 
		INIT_LIST_HEAD(&iwlwifi_opmode_table[i].drv);



	pr_info(DRV_DESCRIPTION "\n");

	pr_info(DRV_COPYRIGHT "\n");



#ifdef CONFIG_IWLWIFI_DEBUGFS

	/* Create the root of iwlwifi debugfs subsystem. */

drivers/net/wireless/intel/iwlwifi/iwl-drv.h

+3 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2008 - 2014, 2020 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 *

 * This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2005 - 2014, 2020 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * All rights reserved.

 *
@@ -63,8 +63,7 @@ 


/* for all modules */

#define DRV_NAME        "iwlwifi"

#define DRV_COPYRIGHT	"Copyright(c) 2003- 2015 Intel Corporation"

#define DRV_AUTHOR     "<linuxwifi@intel.com>"

#define DRV_AUTHOR	"Intel Corporation <linuxwifi@intel.com>"



/* radio config bits (actual values from NVM definition) */

#define NVM_RF_CFG_DASH_MSK(x)   (x & 0x3)         /* bits 0-1   */

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 


#define DRV_DESCRIPTION	"The new Intel(R) wireless AGN driver for Linux"

MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);

MODULE_AUTHOR(DRV_AUTHOR);

MODULE_LICENSE("GPL");



static const struct iwl_op_mode_ops iwl_mvm_ops;