[PATCH 1/4] macb: use dev_xx message

[Sascha Hauer]

On Tue, Feb 05, 2013 at 11:15:03AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> ---
>  drivers/net/macb.c |   34 +++++++++++++++++++---------------
>  1 file changed, 19 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> index 18ac3f8..15b1e93 100644
> --- a/drivers/net/macb.c
> +++ b/drivers/net/macb.c
> @@ -96,7 +96,7 @@ struct macb_device {
>  
>  	int			phy_addr;
>  
> -	const struct device	*dev;
> +	const struct device_d	*dev;
>  	struct eth_device	netdev;
>  
>  	phy_interface_t		interface;
> @@ -112,7 +112,7 @@ static int macb_send(struct eth_device *edev, void *packet,
>  	struct macb_device *macb = edev->priv;
>  	unsigned long ctrl;
>  
> -	debug("%s\n", __func__);
> +	dev_dbg(macb->dev, "%s\n", __func__);
>  
>  	ctrl = length & TXBUF_FRMLEN_MASK;
>  	ctrl |= TXBUF_FRAME_END | TXBUF_WRAP;
> @@ -123,15 +123,15 @@ static int macb_send(struct eth_device *edev, void *packet,
>  	dma_flush_range((ulong) packet, (ulong)packet + length);
>  	macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART));
>  
> -	wait_on_timeout(100 * MSECOND,
> +	ret = wait_on_timeout(100 * MSECOND,
>  		!(macb->tx_ring[0].ctrl & TXBUF_USED));

This hunk belongs to patch 3/4 and breaks compiling here. Fixed that up.

Sascha

>  
>  	ctrl = macb->tx_ring[0].ctrl;
>  
>  	if (ctrl & TXBUF_UNDERRUN)
> -		printf("TX underrun\n");
> +		dev_err(macb->dev, "TX underrun\n");
>  	if (ctrl & TXBUF_EXHAUSTED)
> -		printf("TX buffers exhausted in mid frame\n");
> +		dev_err(macb->dev, "TX buffers exhausted in mid frame\n");
>  
>  	/* No one cares anyway */
>  	return 0;
> @@ -142,7 +142,7 @@ static void reclaim_rx_buffers(struct macb_device *macb,
>  {
>  	unsigned int i;
>  
> -	debug("%s\n", __func__);
> +	dev_dbg(macb->dev, "%s\n", __func__);
>  
>  	i = macb->rx_tail;
>  	while (i > new_tail) {
> @@ -170,7 +170,7 @@ static int macb_recv(struct eth_device *edev)
>  	int wrapped = 0;
>  	u32 status;
>  
> -//	printf("%s\n", __func__);
> +	dev_dbg(macb->dev, "%s\n", __func__);
>  
>  	for (;;) {
>  		if (!(macb->rx_ring[rx_tail].addr & RXADDR_USED))
> @@ -235,7 +235,7 @@ static int macb_open(struct eth_device *edev)
>  {
>  	struct macb_device *macb = edev->priv;
>  
> -	debug("%s\n", __func__);
> +	dev_dbg(macb->dev, "%s\n", __func__);
>  
>  	/* Obtain the PHY's address/id */
>  	return phy_device_connect(edev, &macb->miibus, macb->phy_addr,
> @@ -249,7 +249,7 @@ static int macb_init(struct eth_device *edev)
>  	unsigned long paddr, val = 0;
>  	int i;
>  
> -	debug("%s\n", __func__);
> +	dev_dbg(macb->dev, "%s\n", __func__);
>  
>  	/*
>  	 * macb_halt should have been called at some point before now,
> @@ -318,7 +318,7 @@ static int macb_phy_read(struct mii_bus *bus, int addr, int reg)
>  	int value;
>  	uint64_t start;
>  
> -	debug("%s\n", __func__);
> +	dev_dbg(macb->dev, "%s\n", __func__);
>  
>  	netctl = macb_readl(macb, NCR);
>  	netctl |= MACB_BIT(MPE);
> @@ -335,7 +335,7 @@ static int macb_phy_read(struct mii_bus *bus, int addr, int reg)
>  	do {
>  		netstat = macb_readl(macb, NSR);
>  		if (is_timeout(start, SECOND)) {
> -			printf("phy read timed out\n");
> +			dev_err(macb->dev, "phy read timed out\n");
>  			return -1;
>  		}
>  	} while (!(netstat & MACB_BIT(IDLE)));
> @@ -357,7 +357,7 @@ static int macb_phy_write(struct mii_bus *bus, int addr, int reg, u16 value)
>  	unsigned long netstat;
>  	unsigned long frame;
>  
> -	debug("%s\n", __func__);
> +	dev_dbg(macb->dev, "%s\n", __func__);
>  
>  	netctl = macb_readl(macb, NCR);
>  	netctl |= MACB_BIT(MPE);
> @@ -384,7 +384,9 @@ static int macb_phy_write(struct mii_bus *bus, int addr, int reg, u16 value)
>  
>  static int macb_get_ethaddr(struct eth_device *edev, unsigned char *adr)
>  {
> -	debug("%s\n", __func__);
> +	struct macb_device *macb = edev->priv;
> +
> +	dev_dbg(macb->dev, "%s\n", __func__);
>  
>  	return -1;
>  }
> @@ -393,7 +395,7 @@ static int macb_set_ethaddr(struct eth_device *edev, unsigned char *adr)
>  {
>  	struct macb_device *macb = edev->priv;
>  
> -	debug("%s\n", __func__);
> +	dev_dbg(macb->dev, "%s\n", __func__);
>  
>  	/* set hardware address */
>  	macb_writel(macb, SA1B, adr[0] | adr[1] << 8 | adr[2] << 16 | adr[3] << 24);
> @@ -412,7 +414,7 @@ static int macb_probe(struct device_d *dev)
>  	struct clk *pclk;
>  
>  	if (!dev->platform_data) {
> -		printf("macb: no platform_data\n");
> +		dev_err(dev, "macb: no platform_data\n");
>  		return -ENODEV;
>  	}
>  	pdata = dev->platform_data;
> @@ -421,6 +423,8 @@ static int macb_probe(struct device_d *dev)
>  	edev->priv = (struct macb_device *)(edev + 1);
>  	macb = edev->priv;
>  
> +	macb->dev = dev;
> +
>  	edev->init = macb_init;
>  	edev->open = macb_open;
>  	edev->send = macb_send;
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |