Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea6992aa authored by Masakazu Mokuno's avatar Masakazu Mokuno Committed by Jeff Garzik
Browse files

ps3: some minor cleanups 



- Removed the embarrassing definition which was used in only one
  place.
- Fixed wrong initialization of dmac_cmd_status.

Signed-off-by: default avatarMasakazu Mokuno <mokuno@sm.sony.co.jp>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 9f6c9a8c

drivers/net/ps3_gelic_net.c

+3 −2
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ static void gelic_net_release_rx_chain(struct gelic_net_card *card) 
			descr->buf_addr = 0;

			dev_kfree_skb_any(descr->skb);

			descr->skb = NULL;

			descr->dmac_cmd_status = GELIC_NET_DESCR_NOT_IN_USE;

			gelic_net_set_descr_status(descr,

						   GELIC_NET_DESCR_NOT_IN_USE);

		}

		descr = descr->next;

	} while (descr != card->rx_chain.head);
@@ -374,7 +375,7 @@ static void gelic_net_release_tx_descr(struct gelic_net_card *card, 
	descr->skb = NULL;



	/* set descr status */

	descr->dmac_cmd_status = GELIC_NET_DMAC_CMDSTAT_NOT_IN_USE;

	gelic_net_set_descr_status(descr, GELIC_NET_DESCR_NOT_IN_USE);

}



/**

drivers/net/ps3_gelic_net.h

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ enum gelic_net_int1_status { 
						      * interrupt status */



#define GELIC_NET_DMAC_CMDSTAT_CHAIN_END  0x00000002 /* RXDCEIS:DMA stopped */

#define GELIC_NET_DMAC_CMDSTAT_NOT_IN_USE 0xb0000000

#define GELIC_NET_DESCR_IND_PROC_SHIFT    28

#define GELIC_NET_DESCR_IND_PROC_MASKO    0x0fffffff