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

Commit 955a9d20 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

irda: Convert IRDA_DEBUG to pr_debug 



Use the normal kernel debugging mechanism which also
enables dynamic_debug at the same time.

Other miscellanea:

o Remove sysctl for irda_debug
o Remove function tracing like uses (use ftrace instead)
o Coalesce formats
o Realign arguments
o Remove unnecessary OOM messages

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d326d81

drivers/net/irda/act200l-sir.c

+0 −8
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ static int act200l_open(struct sir_dev *dev) 
{

	struct qos_info *qos = &dev->qos;



	IRDA_DEBUG(2, "%s()\n", __func__ );



	/* Power on the dongle */

	sirdev_set_dtr_rts(dev, TRUE, TRUE);
@@ -124,8 +122,6 @@ static int act200l_open(struct sir_dev *dev) 


static int act200l_close(struct sir_dev *dev)

{

	IRDA_DEBUG(2, "%s()\n", __func__ );



	/* Power off the dongle */

	sirdev_set_dtr_rts(dev, FALSE, FALSE);
@@ -143,8 +139,6 @@ static int act200l_change_speed(struct sir_dev *dev, unsigned speed) 
	u8 control[3];

	int ret = 0;



	IRDA_DEBUG(2, "%s()\n", __func__ );



	/* Clear DTR and set RTS to enter command mode */

	sirdev_set_dtr_rts(dev, FALSE, TRUE);
@@ -212,8 +206,6 @@ static int act200l_reset(struct sir_dev *dev) 
	};

	int ret = 0;



	IRDA_DEBUG(2, "%s()\n", __func__ );



	switch (state) {

	case SIRDEV_STATE_DONGLE_RESET:

		/* Reset the dongle : set RTS low for 25 ms */

drivers/net/irda/actisys-sir.c

+1 −2
Original line number Diff line number Diff line
@@ -165,8 +165,7 @@ static int actisys_change_speed(struct sir_dev *dev, unsigned speed) 
	int ret = 0;

	int i = 0;



        IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __func__,

        	speed, dev->speed);

	pr_debug("%s(), speed=%d (was %d)\n", __func__, speed, dev->speed);



	/* dongle was already resetted from irda_request state machine,

	 * we are in known state (dongle default)

drivers/net/irda/ali-ircc.c

+83 −123

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/irda/donauboe.c

+35 −61

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/irda/girbil-sir.c

+0 −8
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ static int girbil_open(struct sir_dev *dev) 
{

	struct qos_info *qos = &dev->qos;



	IRDA_DEBUG(2, "%s()\n", __func__);



	/* Power on dongle */

	sirdev_set_dtr_rts(dev, TRUE, TRUE);
@@ -102,8 +100,6 @@ static int girbil_open(struct sir_dev *dev) 


static int girbil_close(struct sir_dev *dev)

{

	IRDA_DEBUG(2, "%s()\n", __func__);



	/* Power off dongle */

	sirdev_set_dtr_rts(dev, FALSE, FALSE);
@@ -126,8 +122,6 @@ static int girbil_change_speed(struct sir_dev *dev, unsigned speed) 
	u8 control[2];

	static int ret = 0;



	IRDA_DEBUG(2, "%s()\n", __func__);



	/* dongle alread reset - port and dongle at default speed */



	switch(state) {
@@ -210,8 +204,6 @@ static int girbil_reset(struct sir_dev *dev) 
	u8 control = GIRBIL_TXEN | GIRBIL_RXEN;

	int ret = 0;



	IRDA_DEBUG(2, "%s()\n", __func__);



	switch (state) {

	case SIRDEV_STATE_DONGLE_RESET:

		/* Reset dongle */