AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

net: axienet: Use of_property_* calls

Browse Source 
Use of_property_* calls

Signed-off-by: Srikanth Thokala <sthokal@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Srikanth Thokala 2015-05-05 11:26:03 +02:00 committed by David S. Miller
parent 46aa27df88
commit 8495659bf9
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
View File

@ -1493,13 +1493,13 @@ static void axienet_dma_err_handler(unsigned long data)
*/
static int axienet_of_probe(struct platform_device *pdev)
{
__be32 *p;
int size, ret = 0;
int ret;
struct device_node *np;
struct axienet_local *lp;
struct net_device *ndev;
const void *addr;
u8 mac_addr[6];
struct resource *ethres, dmares;
u32 value;
ndev = alloc_etherdev(sizeof(*lp));
if (!ndev)
@ -1529,9 +1529,9 @@ static int axienet_of_probe(struct platform_device *pdev)
/* Setup checksum offload, but default to off if not specified */
lp->features = 0;
p = (__be32 *)of_get_property(pdev->dev.of_node, "xlnx,txcsum", NULL);
if (p) {
switch (be32_to_cpup(p)) {
ret = of_property_read_u32(pdev->dev.of_node, "xlnx,txcsum", &value);
if (!ret) {
switch (value) {
case 1:
lp->csum_offload_on_tx_path =
XAE_FEATURE_PARTIAL_TX_CSUM;
@ -1550,9 +1550,9 @@ static int axienet_of_probe(struct platform_device *pdev)
lp->csum_offload_on_tx_path = XAE_NO_CSUM_OFFLOAD;
}
}
p = (__be32 *)of_get_property(pdev->dev.of_node, "xlnx,rxcsum", NULL);
if (p) {
switch (be32_to_cpup(p)) {
ret = of_property_read_u32(pdev->dev.of_node, "xlnx,rxcsum", &value);
if (!ret) {
switch (value) {
case 1:
lp->csum_offload_on_rx_path =
XAE_FEATURE_PARTIAL_RX_CSUM;
@ -1573,13 +1573,8 @@ static int axienet_of_probe(struct platform_device *pdev)
* Here we check for memory allocated for Rx/Tx in the hardware from
* the device-tree and accordingly set flags.
*/
p = (__be32 *)of_get_property(pdev->dev.of_node, "xlnx,rxmem", NULL);
if (p)
lp->rxmem = be32_to_cpup(p);
p = (__be32 *)of_get_property(pdev->dev.of_node,
"xlnx,phy-type", NULL);
if (p)
lp->phy_type = be32_to_cpup(p);
of_property_read_u32(pdev->dev.of_node, "xlnx,rxmem", &lp->rxmem);
of_property_read_u32(pdev->dev.of_node, "xlnx,phy-type", &lp->phy_type);
/* Find the DMA node, map the DMA registers, and decode the DMA IRQs */
np = of_parse_phandle(pdev->dev.of_node, "axistream-connected", 0);
@ -1609,13 +1604,13 @@ static int axienet_of_probe(struct platform_device *pdev)
}
/* Retrieve the MAC address */
addr = of_get_property(pdev->dev.of_node, "local-mac-address", &size);
if ((!addr) || (size != 6)) {
ret = of_property_read_u8_array(pdev->dev.of_node,
"local-mac-address", mac_addr, 6);
if (ret) {
dev_err(&pdev->dev, "could not find MAC address\n");
ret = -ENODEV;
goto free_netdev;
}
axienet_set_mac_address(ndev, (void *) addr);
axienet_set_mac_address(ndev, (void *)mac_addr);
lp->coalesce_count_rx = XAXIDMA_DFT_RX_THRESHOLD;
lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;