09 Dec, 2011
1 commit
-
In commit 834d0ee317b (uintxy_t removal) not all changes were trival text replacements, some converted u64 -> dma_addr_t.
In some configurations dma_addr_t is a u32, meaning that some bit operations cause build warnings. From Randy Dunlap:----------------
on i386 (X86_32) builds:drivers/staging/et131x/et131x.c:2483:8: warning: right shift count >= width of type
drivers/staging/et131x/et131x.c:2531:8: warning: right shift count >= width of type
----------------Removed these by reverting dma_addr_t back to u64 types, as well as
reverting some other non-trivial changes from the aforementioned commit.Reported-by: Randy Dunlap
Signed-off-by: Mark Einon
Acked-by: Randy Dunlap
Signed-off-by: Greg Kroah-Hartman
27 Nov, 2011
7 commits
-
Following the move to put the driver into one file, comments were added to identify which source file each set of functions originated from.
These no longer made sense after functions were moved around to remove some forward declarations, so remove them.A function comment was previously not moved along with its function, now they are reunited.
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
FIXME: it should be possible to get rid of ET1310_PCI_L0L1LATENCY as well.
Signed-off-by: Francois Romieu
Acked-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Francois Romieu
Acked-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
pci_{save, restore}_state are balanced in .suspend and .resume.
They are not used anywhere else in the driver.Signed-off-by: Francois Romieu
Acked-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Wrong status code and unbalanced phy_connect.
Signed-off-by: Francois Romieu
Acked-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Francois Romieu
Acked-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Francois Romieu
Acked-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman
19 Nov, 2011
3 commits
-
ET131X is a network device, so it should depend on
NETDEVICES. (This part won't be needed when the driver
moves to drivers/net/.) It also uses PHYLIB interfaces,
so it should select PHYLIB. Fixes these build errors:ERROR: "phy_connect" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_find_first" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "mdiobus_register" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "mdiobus_alloc" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_stop" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_start" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "mdiobus_free" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "mdiobus_unregister" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_print_status" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_ethtool_gset" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_ethtool_sset" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_mii_ioctl" [drivers/staging/et131x/et131x.ko] undefined!Signed-off-by: Randy Dunlap
Acked-by: : Mark Einon
Signed-off-by: Greg Kroah-Hartman -
ET131X uses netdev interfaces so it should depend on NET.
Fixes these build errors:
ERROR: "ethtool_op_get_link" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "eth_validate_addr" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "register_netdev" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_connect" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_find_first" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "mdiobus_register" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "mdiobus_alloc" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "alloc_etherdev_mqs" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "netif_device_detach" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_stop" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "netif_device_attach" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_start" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "free_netdev" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "mdiobus_free" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "mdiobus_unregister" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "unregister_netdev" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "__netif_schedule" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_print_status" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "dev_kfree_skb_any" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "dev_alloc_skb" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "netif_rx" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "eth_type_trans" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "skb_put" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_ethtool_gset" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_ethtool_sset" [drivers/staging/et131x/et131x.ko] undefined!
ERROR: "phy_mii_ioctl" [drivers/staging/et131x/et131x.ko] undefined!Signed-off-by: Randy Dunlap
Signed-off-by: Greg Kroah-Hartman -
Randy Dunlap reports that the ex131x driver doesn't build when CONFIG_PM_SLEEP is not enabled.
This bug was introduced when moving code around to remove some forward declarations earlier, the #endif part of #ifdef CONFIG_PM_SLEEP was not moved at the same time. Now fixed by moving it to its proper place.Reported-by: Randy Dunlap
Signed-off-by: Mark Einon
Acked-by: Randy Dunlap
Signed-off-by: Greg Kroah-Hartman
26 Oct, 2011
2 commits
-
Mark Einon points out that the Kconfig option for NETDEV_1000 no longer
exists, and the merge of the staging drivers should have removed that
for the et131x driver.And while checking for it, I noticed that slicoss had the same stale
dependency. Remove that one too.Reported-by: Mark Einon
Signed-off-by: Linus Torvalds -
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
staging: et131x: Remove redundant check and return statement
staging: et131x: Mainly whitespace changes to appease checkpatch
staging: et131x: Remove last of the forward declarations
staging: et131x: Remove even more forward declarations
staging: et131x: Remove yet more forward declarations
staging: et131x: Remove more forward declarations
staging: et131x: Remove forward declaration of et131x_adapter_setup
staging: et131x: Remove some forward declarations
staging: et131x: Remove unused rx_ring.recv_packet_pool
staging: et131x: Remove call to find pci pm capability
staging: et131x: Remove redundant et131x_reset_recv() call
staging: et131x: Remove unused rx_ring.recv_buffer_pool
Staging: bcm: Fix three initialization errors in InterfaceDld.c
Staging: bcm: Fix coding style issues in InterfaceDld.c
staging:iio:dac: Add AD5360 driver
staging:iio:trigger:bfin-timer: Fix compile error
Staging: vt6655: add some range checks before memcpy()
Staging: vt6655: whitespace fixes to iotcl.c
Staging: vt6656: add some range checks before memcpy()
Staging: vt6656: whitespace cleanups in ioctl.c
...Fix up conflicts in:
- drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
vg driver movement
- drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
driver removal vs now stale changes
- drivers/staging/rtl8192e/r8192E_core.c:
driver removal vs now stale changes
- drivers/staging/et131x/et131*:
driver consolidation into one file, tried to do fixups
23 Oct, 2011
27 commits
-
In nic_send_packet(), by the time 'frag' is checked to be zero, it never
is - the for loop has been entered (as nr_frags is always > 0) and frag
has been incremented at least once. Remove the check and associated
error return.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
- Whitespace changes to appease checkpatch warnings
- Removed unneeded braces around single line if/elseSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Moved functions in et131x.c file to remove the forward declarations of:
et131x_rx_dma_disable
et131x_rx_dma_enable
et131x_init_send
et131x_tx_dma_enableSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Moved functions in et131x.c file to remove the forward declarations of:
et1310_in_phy_coma
et1310_phy_access_mii_bit
et131x_phy_mii_read
et131x_mii_write
et131x_rx_dma_memory_freeSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Moved functions in et131x.c file to remove the forward declarations of:
et1310_setup_device_for_multicast
et1310_setup_device_for_unicast
et131x_up
et131x_down
et131x_enable_txrx
et131x_disable_txrxSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Moved functions in et131x.c file to remove the following forward
declarations:et131x_soft_reset
et131x_isr_handler
et131x_device_allocSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Also associated function movements within et131x.c file
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Moved functions in et131x.c file to remove the following forward
declarations:et131x_align_allocated_memory
et131x_disable_interrupts
et131x_enable_interrupts
et131x_error_timer_handlerSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
tx_ring.recv_packet_pool is unused, even in the original driver code.
Removed.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
pci_find_capability is called, but not used and is now redundant as
power management is handled elsewhere. Removed.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
This call doesn't do anything useful - only warns on the receive list
being empty, so removed it.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
rx_ring.recv_buffer_pool is unused, even in the original driver code.
Remove from stuct, and also remove some comments regarding it.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Some defines are no longer referenced in the code, so removed them.
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Replaced pci map/unmap and set_mask calls with their dma equivalents.
Also updated comments to reflect this.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
* Currently the tx queue is only stopped when the current packet fails.
Check if the next packet will fail, and stop the queue if so.* Removed associated item from TODO list in the README.
* Also minor fixup as adapter was being declared as null and immediately set
to a value.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Used the convenience macros DEFINE_PCI_DEVICE_TABLE and PCI_VDEVICE to
tidy up the device table definition.Also remove the corresponding TODO item from the README.
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Previous update was to replace pci_alloc with dma_alloc calls. I missed
replacing the corresponding pci_free_ calls with the dma versions. Now
done. Thanks to Denis Kirjanov for pointing this
out.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Use dma_allocs instead of pci_allocs, so we can use GFP_KERNEL
allocations.Also removed this item from the TODO list
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
* Following on from making rx_ring.fbr use a common structure - reversed
the fbr[] array indicies so that index 1 = FBR0 and index 0 = FBR1,
which allows USE_FBR0 define to work.* Also fixed up minor issues where indexes into the array were out of
bounds in some places.* Removed rx_ring.fbr common stuct TODO item from README
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Sharing a common structure by moving common structure items into
fbr_lookup.TODO - Currently will not work if USE_FBR0 = 0 as FBR1 uses fbr[1]
which is removed in this caseSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Two helper functions for adding 10bit/12bit umbers with wrapping are
defined in the header. Moved them to the driver .c file.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Driver now resides in a single file with a separate header with
registers, updated the README TODO list.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Move et1310_tx.h contents into et131x.c and delete et1310_tx.h
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Move et1310_rx.h contents into et131x.c and delete et1310_rx.h
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Move et131x_defs.h contents into et131x.c and delete et131x_defs.h
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Move et131x_adapter.h contents into et131x.c and delete et131x_adapter.h
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Move et1310_phy.h register defines into et131x.h and delete
et1310_phy.hSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman