From a9d7e794ea66902a255be6e87f633286d04c2b39 Mon Sep 17 00:00:00 2001 From: "Justin P. Mattock" Date: Sat, 24 Mar 2012 09:00:04 -0700 Subject: r8169.c: fix comment typo The below patch fixes a typo that I found while reading the code. Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina --- drivers/net/ethernet/realtek/r8169.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net') diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 7a0c800..7f06508 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4267,7 +4267,7 @@ static int rtl8169_open(struct net_device *dev) pm_runtime_get_sync(&pdev->dev); /* - * Rx and Tx desscriptors needs 256 bytes alignment. + * Rx and Tx descriptors needs 256 bytes alignment. * dma_alloc_coherent provides more. */ tp->TxDescArray = dma_alloc_coherent(&pdev->dev, R8169_TX_RING_BYTES, -- cgit v1.1 From 59bf896406471ac49d124b3e5f4edcafe28e5360 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 18 Apr 2012 00:01:21 +0900 Subject: Fix "the the" in various Kconfig Fix typo "the the" in various Kconfig. Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina --- drivers/net/can/sja1000/Kconfig | 2 +- drivers/net/irda/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig index b60d6c5..03df9a8 100644 --- a/drivers/net/can/sja1000/Kconfig +++ b/drivers/net/can/sja1000/Kconfig @@ -75,7 +75,7 @@ config CAN_KVASER_PCI tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards" depends on PCI ---help--- - This driver is for the the PCIcanx and PCIcan cards (1, 2 or + This driver is for the PCIcanx and PCIcan cards (1, 2 or 4 channel) from Kvaser (http://www.kvaser.com). config CAN_PLX_PCI diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 4680478..1b6d5c0 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig @@ -316,7 +316,7 @@ config AU1000_FIR tristate "Alchemy IrDA SIR/FIR" depends on IRDA && MIPS_ALCHEMY help - Say Y/M here to build suppor the the IrDA peripheral on the + Say Y/M here to build support the IrDA peripheral on the Alchemy Au1000 and Au1100 SoCs. Say M to build a module; it will be called au1k_ir.ko -- cgit v1.1 From b2cbf2e31bd26abaddcb1ce4cefb09e025247d52 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:50:10 +0200 Subject: typhoon: get rid of redundant conditional before all to release_firmware() There's no need to test for a NULL pointer before calling release_firmware() since the function does that check itself, so remove the redundant test. Signed-off-by: Jesper Juhl Acked-by: David Dillow Signed-off-by: Jiri Kosina --- drivers/net/ethernet/3com/typhoon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index 1234a14..b153666 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c @@ -2549,8 +2549,7 @@ typhoon_init(void) static void __exit typhoon_cleanup(void) { - if (typhoon_fw) - release_firmware(typhoon_fw); + release_firmware(typhoon_fw); pci_unregister_driver(&typhoon_driver); } -- cgit v1.1 From e3c5530b96b9c5994cfb2544a037161790c4f7c3 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:50:15 +0200 Subject: tg3: remove redundant NULL test before release_firmware() call There is no need to test for a NULL pointer before calling release_firmware - the function does that on its own. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina --- drivers/net/ethernet/broadcom/tg3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 062ac33..9fbf73e 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -15842,8 +15842,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev) if (dev) { struct tg3 *tp = netdev_priv(dev); - if (tp->fw) - release_firmware(tp->fw); + release_firmware(tp->fw); tg3_reset_task_cancel(tp); -- cgit v1.1 From 294ca868ed598519cab1cd699873378d46733198 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:50:24 +0200 Subject: bna: remove redundant NULL test before release_firmware() release_firmware() does its own NULL test so explicit test before call is unneeded. Signed-off-by: Jesper Juhl Acked-by: Rasesh Mody Signed-off-by: Jiri Kosina --- drivers/net/ethernet/brocade/bna/bnad.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index ff78f77..d86390c 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c @@ -3546,9 +3546,7 @@ static void __exit bnad_module_exit(void) { pci_unregister_driver(&bnad_pci_driver); - - if (bfi_fw) - release_firmware(bfi_fw); + release_firmware(bfi_fw); } module_init(bnad_module_init); -- cgit v1.1 From 62baaf34dd6cbd3bb5357972789edd2d7d70c206 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:50:31 +0200 Subject: qlogic: get rid of a redundant test for NULL before call to release_firmware() Since release_firmware() deals gracefully with being passed a NULL pointer there is no reason to test explicitly before calling the function. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina --- drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 +-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index 718b274..1fb149c 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c @@ -1261,8 +1261,7 @@ next: void netxen_release_firmware(struct netxen_adapter *adapter) { - if (adapter->fw) - release_firmware(adapter->fw); + release_firmware(adapter->fw); adapter->fw = NULL; } diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index d32cf0d..799fd40 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c @@ -1321,8 +1321,7 @@ next: void qlcnic_release_firmware(struct qlcnic_adapter *adapter) { - if (adapter->fw) - release_firmware(adapter->fw); + release_firmware(adapter->fw); adapter->fw = NULL; } -- cgit v1.1 From 53c0ad522e215251f55623e80b921129aafa0d48 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:50:42 +0200 Subject: tehuti: delete redundant NULL check before release_firmware() release_firmware() checks for NULL pointers - no need to test before the call. Signed-off-by: Jesper Juhl Signed-off-by: Andy Gospodarek Signed-off-by: Jiri Kosina --- drivers/net/ethernet/tehuti/tehuti.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c index ad973ff..a445e77 100644 --- a/drivers/net/ethernet/tehuti/tehuti.c +++ b/drivers/net/ethernet/tehuti/tehuti.c @@ -341,8 +341,8 @@ static int bdx_fw_load(struct bdx_priv *priv) out: if (master) WRITE_REG(priv, regINIT_SEMAPHORE, 1); - if (fw) - release_firmware(fw); + + release_firmware(fw); if (rc) { netdev_err(priv->ndev, "firmware loading failed\n"); -- cgit v1.1 From 3d4f5eb1264a1d3aa4aa19502d8c588b3cc4ecc4 Mon Sep 17 00:00:00 2001 From: Oskar Schirmer Date: Wed, 16 May 2012 09:41:18 +0000 Subject: net: Change mail address of Oskar Schirmer That old mail address doesnt exist any more. This changes all occurences to my new address. Signed-off-by: Oskar Schirmer Cc: netdev@vger.kernel.org Signed-off-by: Jiri Kosina --- drivers/net/ethernet/s6gmac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/ethernet/s6gmac.c b/drivers/net/ethernet/s6gmac.c index 1895605..6f0d284 100644 --- a/drivers/net/ethernet/s6gmac.c +++ b/drivers/net/ethernet/s6gmac.c @@ -1,7 +1,7 @@ /* * Ethernet driver for S6105 on chip network device * (c)2008 emlix GmbH http://www.emlix.com - * Authors: Oskar Schirmer + * Authors: Oskar Schirmer * Daniel Gloeckner * * This program is free software; you can redistribute it and/or @@ -1070,4 +1070,4 @@ module_exit(s6gmac_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("S6105 on chip Ethernet driver"); -MODULE_AUTHOR("Oskar Schirmer "); +MODULE_AUTHOR("Oskar Schirmer "); -- cgit v1.1