summaryrefslogtreecommitdiffstats
path: root/drivers/staging/slicoss
Commit message (Collapse)AuthorAgeFilesLines
* Staging: merge staging patches into Linus's main branchGreg Kroah-Hartman2010-03-042-63/+62Star
|\ | | | | | | | | | | | | | | There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: Fix continuation line formatsJoe Perches2010-03-041-4/+2Star
| | | | | | | | | | | | | | | | | | String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: declare MODULE_FIRMWARE in various driversBen Hutchings2010-03-041-0/+6
| | | | | | | | | | | | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: slicoss Use pci_set_consistent_dma_mask.kirjanov@gmail.com2010-03-041-5/+18
| | | | | | | | | | | | | | | | | | Use pci_set_consistent_dma_mask() in the case of 64-bit consistent allocations. Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: slicoss Use compare_ether_addr.kirjanov@gmail.com2010-03-042-17/+3Star
| | | | | | | | | | | | | | | | | | Use compare_ether_addr. Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: slicoss Use PCI_DEVICE_TABLE.kirjanov@gmail.com2010-03-041-8/+4Star
| | | | | | | | | | | | | | | | | | | | Use PCI_DEVICE_TABLE: defines array as const and puts it into the __devinitconst section. Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: slicoss Use dev->stats rather than adapter->stats.kirjanov@gmail.com2010-03-041-13/+12Star
| | | | | | | | | | | | | | | | | | Use dev->stats rather than adapter->stats. Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: slicoss No need to check pointer in debugfs_remove()kirjanov@gmail.com2010-03-041-4/+2Star
| | | | | | | | | | | | | | | | | | No need to check pointer expicitly since it has been done in debugfs_remove() Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: slicoss No need type casting when using netdev_privkirjanov@gmail.com2010-03-041-10/+10
| | | | | | | | | | | | | | | | | | No need type casting when using netdev_priv. Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: slicoss Check for valid hw addresskirjanov@gmail.com2010-03-041-0/+3
| | | | | | | | | | | | | | | | Check for valid hw address. Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: slicoss Convert to netdev_tx_tkirjanov@gmail.com2010-03-041-2/+2
| | | | | | | | | | | | | | | | | | Convert to netdev_tx_t. Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: convert to use netdev_for_each_mc_addrJiri Pirko2010-02-181-12/+4Star
| | | | | | | | | | | | | | | | removed needless checks in arlan-main.c and slicoss.c fixed bug in et131x_netdev.c to actually fill addresses in. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net: use netdev_mc_count and netdev_mc_empty when appropriateJiri Pirko2010-02-121-1/+1
|/ | | | | | | | | | | This patch replaces dev->mc_count in all drivers (hopefully I didn't miss anything). Used spatch and did small tweaks and conding style changes when it was suitable. Jirka Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Staging: slicoss: remove duplicate structure field initializationJulia Lawall2009-12-111-1/+0Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The definition of slic_netdev_ops has initializations of a local function and eth_mac_addr for its ndo_set_mac_address field. This change uses only the local function. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ identifier I, s, fld; position p0,p; expression E; @@ struct I s =@p0 { ... .fld@p = E, ...}; @s@ identifier I, s, r.fld; position r.p0,p; expression E; @@ struct I s =@p0 { ... .fld@p = E, ...}; @script:python@ p0 << r.p0; fld << r.fld; ps << s.p; pr << r.p; @@ if int(ps[0].line)!=int(pr[0].line) or int(ps[0].column)!=int(pr[0].column): cocci.print_main(fld,p0) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: ARRAY_SIZE changesStoyan Gaydarov2009-09-151-1/+1
| | | | | | | | These changes were a direct result of using a semantic patch More information can be found at http://www.emn.fr/x-info/coccinelle/ Signed-off-by: Stoyan Gaydarov <sgayda2@uiuc.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functionsPatrick McHardy2009-07-061-1/+1
| | | | | | | | | | | This patch is the result of an automatic spatch transformation to convert all ndo_start_xmit() return values of 0 to NETDEV_TX_OK. Some occurences are missed by the automatic conversion, those will be handled in a seperate patch. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* Staging: slicoss: fix build warningsGreg Kroah-Hartman2009-06-191-1/+0Star
| | | | | | This fixes some build warnings in the slicoss driver. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: Add missing __devexit_p()Jean Delvare2009-06-191-1/+1
| | | | | | | | | The remove function uses __devexit, so the .remove assignment needs __devexit_p() to fix a build error with hotplug disabled. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: slicoss: update READMEStephen Hemminger2009-04-171-1/+30
| | | | | | | | | I looked, I gagged, I left Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Revert Staging: SLICOSS: use gfp_kernel where possibleLior Dotan2009-04-171-2/+2
| | | | | | | | | | | | Revert commit 2bb347361e2c19799431f56488a3f64de40a3aa6 This commit has been reported to cause problems: Mar 24 11:50:31 linuxdev kernel: BUG: sleeping function called from invalid context at mm/slub.c:1599 Mar 24 11:50:31 linuxdev kernel: in_atomic(): 1, irqs_disabled(): 0, pid: 3251, name: avahi-daemon Cc: Lior Dotan <liodot@gmail.com> Cc: Christopher Harrer <charrer@alacritech.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: convert to netdev_opsAlexander Beregalov2009-04-171-7/+14
| | | | | | | Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)Yang Hongyang2009-04-071-2/+2
| | | | | | | | Replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64) Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Staging: slicoss: slichw.h cleanupGreg Kroah-Hartman2009-04-031-514/+510Star
| | | | | | | | | Lots of spaces->tabs cleanups for slichw.h It's much more sane and "Linux-like" now. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: delete slicdbg.hGreg Kroah-Hartman2009-04-032-68/+15Star
| | | | | | | | Move the ASSERT macro into slicoss.c as that's all that is currently being used. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove ASSERTMSG macroGreg Kroah-Hartman2009-04-031-14/+0Star
| | | | | | | No one uses it, so drop it. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove DBG_ERROR macroGreg Kroah-Hartman2009-04-032-119/+112Star
| | | | | | | | Use the dev_err() call instead, it is the standard and provides much more information. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove SLICLEVEL and SLIC_DISPLAY macrosGreg Kroah-Hartman2009-04-032-7/+3Star
| | | | | | | They aren't needed or used anymore. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove SLIC_ETHTOOL_SUPPORTGreg Kroah-Hartman2009-04-031-110/+74Star
| | | | | | | | | It was always enabled, so just always use it. Cleaned up the ioctl code a bit as well to make it more readable. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove DBG_MSGGreg Kroah-Hartman2009-04-032-551/+28Star
| | | | | | | It's not being used for anything, so delete it and all instances of it. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove VALID_ADDRESS macroGreg Kroah-Hartman2009-04-032-10/+0Star
| | | | | | | | It's quite wierd, and doesn't even do anything on x86_64, so just delete it. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove SLIC_PING_TIMER_ENABLEDGreg Kroah-Hartman2009-04-031-5/+3Star
| | | | | | | It was always enabled, so just enable it properly. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove LINUX_FREES_ADAPTER_RESOURCESGreg Kroah-Hartman2009-04-031-3/+0Star
| | | | | | | | It was always enabled, so just enable it and take out the one place it was being used. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove SLIC_POWER_MANAGEMENT_ENABLEDGreg Kroah-Hartman2009-04-031-8/+0Star
| | | | | | | | | | | It was always disabled, so just remove it and the 2 lines of code it was protecting. Also remove SLIC_POWER_MANAGEMENT which was also disabled, yet was never used. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: add proper KERN_DEBUG to 2 printksGreg Kroah-Hartman2009-04-031-3/+3
| | | | | | | Added bonus is this fixes a compiler warning on 4.3.3 Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove SLIC_GET_STATS_ENABLEDGreg Kroah-Hartman2009-04-031-12/+1Star
| | | | | | | | It was always enabled, so just turn on the code that was being always enabled, and remove the #define. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: delete slicinc.hGreg Kroah-Hartman2009-04-032-163/+72Star
| | | | | | | | Putting static function prototypes in a .h file doesn't make much sense. Move the ones that we need into the .c file and delete the rest. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove SLIC_GET_STATS_TIMER_ENABLEDGreg Kroah-Hartman2009-04-032-66/+0Star
| | | | | | | | SLIC_GET_STATS_TIMER_ENABLED was never defined, so remove the code that was bound by it. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: clean up SLIC_DUMP_ENABLEDGreg Kroah-Hartman2009-04-034-1570/+2Star
| | | | | | | | As SLIC_DUMP_ENABLED was disabled, remove the code that it was keeping from being built as it was not ever used. This removed a lot. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: delete slicbuild.hGreg Kroah-Hartman2009-04-031-88/+0Star
| | | | | | | | It was just duplicating the same #defines already in the .c file and it wasn't even being #included in any file. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove unused #definesGreg Kroah-Hartman2009-04-032-22/+12Star
| | | | | | | There are a number of "config" defines that do nothing, remove them. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove slic_os.hGreg Kroah-Hartman2009-04-032-47/+0Star
| | | | | | | It's no longer needed, and empty, so remove it. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove WRITE_REG wrapperGreg Kroah-Hartman2009-04-033-107/+96Star
| | | | | | | It's not needed, so just call the function instead of using a define. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove WRITE_REG64 wrapperGreg Kroah-Hartman2009-04-033-87/+51Star
| | | | | | | It's not needed, so just call the function instead of using a define. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove DEBUG_REGISTER_TRACEGreg Kroah-Hartman2009-04-032-42/+0Star
| | | | | | | It's not ever defined, so remove it from the code base. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove jiffies macrosGreg Kroah-Hartman2009-04-032-15/+9Star
| | | | | | | Use the ones built into the kernel, don't reinvent the wheel. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: remove TRUE/FALSE usageGreg Kroah-Hartman2009-04-034-38/+21Star
| | | | | | | Don't use TRUE and FALSE, we have proper boolean types in the kernel. Cc: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: SLICOSS: use gfp_kernel where possibleLior Dotan2009-04-031-4/+4
| | | | | | | | Use GFP_KERNEL instead of GFP_ATOMIC where possible. Signed_off-by: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: SLICOSS: free resources on entry_probe error pathLior Dotan2009-04-031-8/+9
| | | | | | | | Call pci_disable_device() and free_netdev() if slic_entry_probe fails. Signed_off-by: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: slicoss: add binary firmware to firmware directoryLior Dotan2009-04-031-4/+4
| | | | | | | | | | | | | | | Adds the firmware to the firmware directory in ihex format so it can be installed when doing make firmware_install. Also update the firmware location in the driver code so it can locate the files in the right place. This should conclude the move to request_firmware(). Signed-off-by: Lior Dotan <liodot@gmail.com> Cc: Christopher Harrer <charrer@alacritech.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: SLICOSS: remove the static firmware header filesLior Dotan2009-04-035-22356/+0Star
| | | | | | | | Remove the static headers with the firmware code, they are no longer needed. Signed-off-by: Lior Dotan <liodot@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-09 01:55:27 +0200