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

Commit 2c21c985 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: usbatm: remove CONFIG_USB_DEBUG dependancy 



Now that no USB atm driver is relying on the CONFIG_USB_DEBUG option
(well, really the DEBUG option, thanks to some Makefile fun), remove it
from the Makefile.

Also remove two last vestiges of DEBUG in the usbatm.c driver, moving
one to VERBOSE_DEBUG, which no one ever really cares about, and the
other to use the dynamic debug subsystem.

Cc: Duncan Sands <duncan.sands@free.fr>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d6401cf

drivers/usb/atm/Makefile

+0 −3
Original line number Diff line number Diff line 
#

# Makefile for USB ATM/xDSL drivers

#



ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG



obj-$(CONFIG_USB_CXACRU)	+= cxacru.o

obj-$(CONFIG_USB_SPEEDTOUCH)	+= speedtch.o

obj-$(CONFIG_USB_UEAGLEATM)	+= ueagle-atm.o

drivers/usb/atm/usbatm.c

+3 −4
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) 


	/* racy disconnection check - fine */

	if (!instance || instance->disconnected) {

#ifdef DEBUG

#ifdef VERBOSE_DEBUG

		printk_ratelimited(KERN_DEBUG "%s: %s!\n", __func__, instance ? "disconnected" : "NULL instance");

#endif

		err = -ENODEV;
@@ -1120,14 +1120,13 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id, 
	instance->rx_channel.buf_size = num_packets * maxpacket;

	instance->rx_channel.packet_size = maxpacket;



#ifdef DEBUG

	for (i = 0; i < 2; i++) {

		struct usbatm_channel *channel = i ?

			&instance->tx_channel : &instance->rx_channel;



		dev_dbg(dev, "%s: using %d byte buffer for %s channel 0x%p\n", __func__, channel->buf_size, i ? "tx" : "rx", channel);

		dev_dbg(dev, "%s: using %d byte buffer for %s channel 0x%p\n",

			__func__, channel->buf_size, i ? "tx" : "rx", channel);

	}

#endif



	/* initialize urbs */