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

Commit 8c4877a4 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

ehea: Use the standard logging functions 



Remove ehea_error, ehea_info and ehea_debug macros.
Use pr_fmt, pr_<level>, netdev_<level> and netif_<level> as appropriate.
Fix messages to use trailing "\n", some messages had an extra one
as the old ehea_<level> macros added a trailing "\n".
Coalesced long format strings.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarBreno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 323e126f

drivers/net/ehea/ehea.h

+0 −13
Original line number Diff line number Diff line
@@ -130,19 +130,6 @@ 


/* utility functions */



#define ehea_info(fmt, args...) \

	printk(KERN_INFO DRV_NAME ": " fmt "\n", ## args)



#define ehea_error(fmt, args...) \

	printk(KERN_ERR DRV_NAME ": Error in %s: " fmt "\n", __func__, ## args)



#ifdef DEBUG

#define ehea_debug(fmt, args...) \

	printk(KERN_DEBUG DRV_NAME ": " fmt, ## args)

#else

#define ehea_debug(fmt, args...) do {} while (0)

#endif



void ehea_dump(void *adr, int len, char *msg);



#define EHEA_BMASK(pos, length) (((pos) << 16) + (length))

drivers/net/ehea/ehea_ethtool.c

+10 −8
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include "ehea.h"

#include "ehea_phyp.h"
@@ -118,9 +120,9 @@ static int ehea_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	ret = ehea_set_portspeed(port, sp);



	if (!ret)

		ehea_info("%s: Port speed successfully set: %dMbps "

			  "%s Duplex",

			  port->netdev->name, port->port_speed,

		netdev_info(dev,

			    "Port speed successfully set: %dMbps %s Duplex\n",

			    port->port_speed,

			    port->full_duplex == 1 ? "Full" : "Half");

out:

	return ret;
@@ -134,9 +136,9 @@ static int ehea_nway_reset(struct net_device *dev) 
	ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG);



	if (!ret)

		ehea_info("%s: Port speed successfully set: %dMbps "

			  "%s Duplex",

			  port->netdev->name, port->port_speed,

		netdev_info(port->netdev,

			    "Port speed successfully set: %dMbps %s Duplex\n",

			    port->port_speed,

			    port->full_duplex == 1 ? "Full" : "Half");

	return ret;

}