Skip to content

L
linux
Commit 984f6868 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

USB: serial: io_edgeport.c: remove dbg() usage 

dbg() was a very old USB-serial-specific macro.
This patch removes it from being used in the
driver and uses dev_dbg() instead.

Cc: Johan Hovold <jhovold@gmail.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb83be98
Show whitespace changes
Inline Side-by-side
Showing with 277 additions and 324 deletions
drivers/usb/serial/io_edgeport.c
View file @ 984f6868
...@@ -244,7 +244,7 @@ static void handle_new_lsr(struct edgeport_port *edge_port, __u8 lsrData, ...@@ -244,7 +244,7 @@ static void handle_new_lsr(struct edgeport_port *edge_port, __u8 lsrData,
__u8 lsr, __u8 data); __u8 lsr, __u8 data);
static int send_iosp_ext_cmd(struct edgeport_port *edge_port, __u8 command, static int send_iosp_ext_cmd(struct edgeport_port *edge_port, __u8 command,
__u8 param); __u8 param);
static int calc_baud_rate_divisor(int baud_rate, int *divisor); static int calc_baud_rate_divisor(struct device *dev, int baud_rate, int *divisor);
static int send_cmd_write_baud_rate(struct edgeport_port *edge_port, static int send_cmd_write_baud_rate(struct edgeport_port *edge_port,
int baudRate); int baudRate);
static void change_port_settings(struct tty_struct *tty, static void change_port_settings(struct tty_struct *tty,
...@@ -286,6 +286,7 @@ static void unicode_to_ascii(char *string, int buflen, ...@@ -286,6 +286,7 @@ static void unicode_to_ascii(char *string, int buflen,
************************************************************************/ ************************************************************************/
static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial) static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial)
{ {
struct device *dev = &edge_serial->serial->dev->dev;
__u32 BootCurVer; __u32 BootCurVer;
__u32 BootNewVer; __u32 BootNewVer;
__u8 BootMajorVersion; __u8 BootMajorVersion;
...@@ -311,7 +312,7 @@ static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial) ...@@ -311,7 +312,7 @@ static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial)
response = request_ihex_firmware(&fw, fw_name, response = request_ihex_firmware(&fw, fw_name,
&edge_serial->serial->dev->dev); &edge_serial->serial->dev->dev);
if (response) { if (response) {
printk(KERN_ERR "Failed to load image \"%s\" err %d\n", dev_err(dev, "Failed to load image \"%s\" err %d\n",
fw_name, response); fw_name, response);
return; return;
} }
...@@ -330,20 +331,20 @@ static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial) ...@@ -330,20 +331,20 @@ static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial)
(BootMinorVersion << 16) + (BootMinorVersion << 16) +
BootBuildNumber; BootBuildNumber;
dbg("Current Boot Image version %d.%d.%d", dev_dbg(dev, "Current Boot Image version %d.%d.%d\n",
edge_serial->boot_descriptor.MajorVersion, edge_serial->boot_descriptor.MajorVersion,
edge_serial->boot_descriptor.MinorVersion, edge_serial->boot_descriptor.MinorVersion,
le16_to_cpu(edge_serial->boot_descriptor.BuildNumber)); le16_to_cpu(edge_serial->boot_descriptor.BuildNumber));
if (BootNewVer > BootCurVer) { if (BootNewVer > BootCurVer) {
dbg("**Update Boot Image from %d.%d.%d to %d.%d.%d", dev_dbg(dev, "**Update Boot Image from %d.%d.%d to %d.%d.%d\n",
edge_serial->boot_descriptor.MajorVersion, edge_serial->boot_descriptor.MajorVersion,
edge_serial->boot_descriptor.MinorVersion, edge_serial->boot_descriptor.MinorVersion,
le16_to_cpu(edge_serial->boot_descriptor.BuildNumber), le16_to_cpu(edge_serial->boot_descriptor.BuildNumber),
BootMajorVersion, BootMinorVersion, BootBuildNumber); BootMajorVersion, BootMinorVersion, BootBuildNumber);
dbg("Downloading new Boot Image"); dev_dbg(dev, "Downloading new Boot Image\n");
for (rec = ihex_next_binrec(rec); rec; for (rec = ihex_next_binrec(rec); rec;
rec = ihex_next_binrec(rec)) { rec = ihex_next_binrec(rec)) {
...@@ -362,7 +363,7 @@ static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial) ...@@ -362,7 +363,7 @@ static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial)
} }
} }
} else { } else {
dbg("Boot Image -- already up to date"); dev_dbg(dev, "Boot Image -- already up to date\n");
} }
release_firmware(fw); release_firmware(fw);
} }
...@@ -379,7 +380,7 @@ static int get_string_desc(struct usb_device *dev, int Id, ...@@ -379,7 +380,7 @@ static int get_string_desc(struct usb_device *dev, int Id,
struct usb_string_descriptor StringDesc; struct usb_string_descriptor StringDesc;
struct usb_string_descriptor *pStringDesc; struct usb_string_descriptor *pStringDesc;
dbg("%s - USB String ID = %d", __func__, Id); dev_dbg(&dev->dev, "%s - USB String ID = %d\n", __func__, Id);
if (!usb_get_descriptor(dev, USB_DT_STRING, Id, &StringDesc, if (!usb_get_descriptor(dev, USB_DT_STRING, Id, &StringDesc,
sizeof(StringDesc))) sizeof(StringDesc)))
...@@ -400,34 +401,39 @@ static int get_string_desc(struct usb_device *dev, int Id, ...@@ -400,34 +401,39 @@ static int get_string_desc(struct usb_device *dev, int Id,
} }
#endif #endif
static void dump_product_info(struct edgeport_product_info *product_info) static void dump_product_info(struct edgeport_serial *edge_serial,
struct edgeport_product_info *product_info)
{ {
struct device *dev = &edge_serial->serial->dev->dev;
/* Dump Product Info structure */ /* Dump Product Info structure */
dbg("**Product Information:"); dev_dbg(dev, "**Product Information:\n");
dbg(" ProductId %x", product_info->ProductId); dev_dbg(dev, " ProductId %x\n", product_info->ProductId);
dbg(" NumPorts %d", product_info->NumPorts); dev_dbg(dev, " NumPorts %d\n", product_info->NumPorts);
dbg(" ProdInfoVer %d", product_info->ProdInfoVer); dev_dbg(dev, " ProdInfoVer %d\n", product_info->ProdInfoVer);
dbg(" IsServer %d", product_info->IsServer); dev_dbg(dev, " IsServer %d\n", product_info->IsServer);
dbg(" IsRS232 %d", product_info->IsRS232); dev_dbg(dev, " IsRS232 %d\n", product_info->IsRS232);
dbg(" IsRS422 %d", product_info->IsRS422); dev_dbg(dev, " IsRS422 %d\n", product_info->IsRS422);
dbg(" IsRS485 %d", product_info->IsRS485); dev_dbg(dev, " IsRS485 %d\n", product_info->IsRS485);
dbg(" RomSize %d", product_info->RomSize); dev_dbg(dev, " RomSize %d\n", product_info->RomSize);
dbg(" RamSize %d", product_info->RamSize); dev_dbg(dev, " RamSize %d\n", product_info->RamSize);
dbg(" CpuRev %x", product_info->CpuRev); dev_dbg(dev, " CpuRev %x\n", product_info->CpuRev);
dbg(" BoardRev %x", product_info->BoardRev); dev_dbg(dev, " BoardRev %x\n", product_info->BoardRev);
dbg(" BootMajorVersion %d.%d.%d", product_info->BootMajorVersion, dev_dbg(dev, " BootMajorVersion %d.%d.%d\n",
product_info->BootMajorVersion,
product_info->BootMinorVersion, product_info->BootMinorVersion,
le16_to_cpu(product_info->BootBuildNumber)); le16_to_cpu(product_info->BootBuildNumber));
dbg(" FirmwareMajorVersion %d.%d.%d", dev_dbg(dev, " FirmwareMajorVersion %d.%d.%d\n",
product_info->FirmwareMajorVersion, product_info->FirmwareMajorVersion,
product_info->FirmwareMinorVersion, product_info->FirmwareMinorVersion,
le16_to_cpu(product_info->FirmwareBuildNumber)); le16_to_cpu(product_info->FirmwareBuildNumber));
dbg(" ManufactureDescDate %d/%d/%d", dev_dbg(dev, " ManufactureDescDate %d/%d/%d\n",
product_info->ManufactureDescDate[0], product_info->ManufactureDescDate[0],
product_info->ManufactureDescDate[1], product_info->ManufactureDescDate[1],
product_info->ManufactureDescDate[2]+1900); product_info->ManufactureDescDate[2]+1900);
dbg(" iDownloadFile 0x%x", product_info->iDownloadFile); dev_dbg(dev, " iDownloadFile 0x%x\n",
dbg(" EpicVer %d", product_info->EpicVer); product_info->iDownloadFile);
dev_dbg(dev, " EpicVer %d\n", product_info->EpicVer);
} }
static void get_product_info(struct edgeport_serial *edge_serial) static void get_product_info(struct edgeport_serial *edge_serial)
...@@ -490,7 +496,7 @@ static void get_product_info(struct edgeport_serial *edge_serial) ...@@ -490,7 +496,7 @@ static void get_product_info(struct edgeport_serial *edge_serial)
break; break;
} }
dump_product_info(product_info); dump_product_info(edge_serial, product_info);
} }
static int get_epic_descriptor(struct edgeport_serial *ep) static int get_epic_descriptor(struct edgeport_serial *ep)
...@@ -500,6 +506,7 @@ static int get_epic_descriptor(struct edgeport_serial *ep) ...@@ -500,6 +506,7 @@ static int get_epic_descriptor(struct edgeport_serial *ep)
struct edgeport_product_info *product_info = &ep->product_info; struct edgeport_product_info *product_info = &ep->product_info;
struct edge_compatibility_descriptor *epic = &ep->epic_descriptor; struct edge_compatibility_descriptor *epic = &ep->epic_descriptor;
struct edge_compatibility_bits *bits; struct edge_compatibility_bits *bits;
struct device *dev = &serial->dev->dev;
ep->is_epic = 0; ep->is_epic = 0;
result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
...@@ -509,8 +516,6 @@ static int get_epic_descriptor(struct edgeport_serial *ep) ...@@ -509,8 +516,6 @@ static int get_epic_descriptor(struct edgeport_serial *ep)
sizeof(struct edge_compatibility_descriptor), sizeof(struct edge_compatibility_descriptor),
300); 300);
dbg("%s result = %d", __func__, result);
if (result > 0) { if (result > 0) {
ep->is_epic = 1; ep->is_epic = 1;
memset(product_info, 0, sizeof(struct edgeport_product_info)); memset(product_info, 0, sizeof(struct edgeport_product_info));
...@@ -524,23 +529,23 @@ static int get_epic_descriptor(struct edgeport_serial *ep) ...@@ -524,23 +529,23 @@ static int get_epic_descriptor(struct edgeport_serial *ep)
product_info->EpicVer = epic->EpicVer; product_info->EpicVer = epic->EpicVer;
product_info->Epic = epic->Supports; product_info->Epic = epic->Supports;
product_info->ProductId = ION_DEVICE_ID_EDGEPORT_COMPATIBLE; product_info->ProductId = ION_DEVICE_ID_EDGEPORT_COMPATIBLE;
dump_product_info(product_info); dump_product_info(ep, product_info);
bits = &ep->epic_descriptor.Supports; bits = &ep->epic_descriptor.Supports;
dbg("**EPIC descriptor:"); dev_dbg(dev, "**EPIC descriptor:\n");
dbg(" VendEnableSuspend: %s", bits->VendEnableSuspend ? "TRUE": "FALSE"); dev_dbg(dev, " VendEnableSuspend: %s\n", bits->VendEnableSuspend ? "TRUE": "FALSE");
dbg(" IOSPOpen : %s", bits->IOSPOpen ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPOpen : %s\n", bits->IOSPOpen ? "TRUE": "FALSE");
dbg(" IOSPClose : %s", bits->IOSPClose ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPClose : %s\n", bits->IOSPClose ? "TRUE": "FALSE");
dbg(" IOSPChase : %s", bits->IOSPChase ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPChase : %s\n", bits->IOSPChase ? "TRUE": "FALSE");
dbg(" IOSPSetRxFlow : %s", bits->IOSPSetRxFlow ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPSetRxFlow : %s\n", bits->IOSPSetRxFlow ? "TRUE": "FALSE");
dbg(" IOSPSetTxFlow : %s", bits->IOSPSetTxFlow ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPSetTxFlow : %s\n", bits->IOSPSetTxFlow ? "TRUE": "FALSE");
dbg(" IOSPSetXChar : %s", bits->IOSPSetXChar ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPSetXChar : %s\n", bits->IOSPSetXChar ? "TRUE": "FALSE");
dbg(" IOSPRxCheck : %s", bits->IOSPRxCheck ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPRxCheck : %s\n", bits->IOSPRxCheck ? "TRUE": "FALSE");
dbg(" IOSPSetClrBreak : %s", bits->IOSPSetClrBreak ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPSetClrBreak : %s\n", bits->IOSPSetClrBreak ? "TRUE": "FALSE");
dbg(" IOSPWriteMCR : %s", bits->IOSPWriteMCR ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPWriteMCR : %s\n", bits->IOSPWriteMCR ? "TRUE": "FALSE");
dbg(" IOSPWriteLCR : %s", bits->IOSPWriteLCR ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPWriteLCR : %s\n", bits->IOSPWriteLCR ? "TRUE": "FALSE");
dbg(" IOSPSetBaudRate : %s", bits->IOSPSetBaudRate ? "TRUE": "FALSE"); dev_dbg(dev, " IOSPSetBaudRate : %s\n", bits->IOSPSetBaudRate ? "TRUE": "FALSE");
dbg(" TrueEdgeport : %s", bits->TrueEdgeport ? "TRUE": "FALSE"); dev_dbg(dev, " TrueEdgeport : %s\n", bits->TrueEdgeport ? "TRUE": "FALSE");
} }
return result; return result;
...@@ -562,6 +567,7 @@ static int get_epic_descriptor(struct edgeport_serial *ep) ...@@ -562,6 +567,7 @@ static int get_epic_descriptor(struct edgeport_serial *ep)
static void edge_interrupt_callback(struct urb *urb) static void edge_interrupt_callback(struct urb *urb)
{ {
struct edgeport_serial *edge_serial = urb->context; struct edgeport_serial *edge_serial = urb->context;
struct device *dev;
struct edgeport_port *edge_port; struct edgeport_port *edge_port;
struct usb_serial_port *port; struct usb_serial_port *port;
struct tty_struct *tty; struct tty_struct *tty;
...@@ -574,8 +580,6 @@ static void edge_interrupt_callback(struct urb *urb) ...@@ -574,8 +580,6 @@ static void edge_interrupt_callback(struct urb *urb)
int result; int result;
int status = urb->status; int status = urb->status;
dbg("%s", __func__);
switch (status) { switch (status) {
case 0: case 0:
/* success */ /* success */
...@@ -584,36 +588,42 @@ static void edge_interrupt_callback(struct urb *urb) ...@@ -584,36 +588,42 @@ static void edge_interrupt_callback(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", dev_dbg(&urb->dev->dev, "%s - urb shutting down with status: %d\n", __func__, status);
__func__, status);
return; return;
default: default:
dbg("%s - nonzero urb status received: %d", __func__, status); dev_dbg(&urb->dev->dev, "%s - nonzero urb status received: %d\n", __func__, status);
goto exit; goto exit;
} }
dev = &edge_serial->serial->dev->dev;
/* process this interrupt-read even if there are no ports open */ /* process this interrupt-read even if there are no ports open */
if (length) { if (length) {
usb_serial_debug_data(debug, &edge_serial->serial->dev->dev, usb_serial_debug_data(debug, dev, __func__, length, data);
__func__, length, data);
if (length > 1) { if (length > 1) {
bytes_avail = data[0] | (data[1] << 8); bytes_avail = data[0] | (data[1] << 8);
if (bytes_avail) { if (bytes_avail) {
spin_lock(&edge_serial->es_lock); spin_lock(&edge_serial->es_lock);
edge_serial->rxBytesAvail += bytes_avail; edge_serial->rxBytesAvail += bytes_avail;
dbg("%s - bytes_avail=%d, rxBytesAvail=%d, read_in_progress=%d", __func__, bytes_avail, edge_serial->rxBytesAvail, edge_serial->read_in_progress); dev_dbg(dev,
"%s - bytes_avail=%d, rxBytesAvail=%d, read_in_progress=%d\n",
__func__, bytes_avail,
edge_serial->rxBytesAvail,
edge_serial->read_in_progress);
if (edge_serial->rxBytesAvail > 0 && if (edge_serial->rxBytesAvail > 0 &&
!edge_serial->read_in_progress) { !edge_serial->read_in_progress) {
dbg("%s - posting a read", __func__); dev_dbg(dev, "%s - posting a read\n", __func__);
edge_serial->read_in_progress = true; edge_serial->read_in_progress = true;
/* we have pending bytes on the /* we have pending bytes on the
bulk in pipe, send a request */ bulk in pipe, send a request */
result = usb_submit_urb(edge_serial->read_urb, GFP_ATOMIC); result = usb_submit_urb(edge_serial->read_urb, GFP_ATOMIC);
if (result) { if (result) {
dev_err(&edge_serial->serial->dev->dev, "%s - usb_submit_urb(read bulk) failed with result = %d\n", __func__, result); dev_err(dev,
"%s - usb_submit_urb(read bulk) failed with result = %d\n",
__func__, result);
edge_serial->read_in_progress = false; edge_serial->read_in_progress = false;
} }
} }
...@@ -633,7 +643,7 @@ static void edge_interrupt_callback(struct urb *urb) ...@@ -633,7 +643,7 @@ static void edge_interrupt_callback(struct urb *urb)
spin_lock(&edge_port->ep_lock); spin_lock(&edge_port->ep_lock);
edge_port->txCredits += txCredits; edge_port->txCredits += txCredits;
spin_unlock(&edge_port->ep_lock); spin_unlock(&edge_port->ep_lock);
dbg("%s - txcredits for port%d = %d", dev_dbg(dev, "%s - txcredits for port%d = %d\n",
__func__, portNumber, __func__, portNumber,
edge_port->txCredits); edge_port->txCredits);
...@@ -673,49 +683,48 @@ static void edge_interrupt_callback(struct urb *urb) ...@@ -673,49 +683,48 @@ static void edge_interrupt_callback(struct urb *urb)
static void edge_bulk_in_callback(struct urb *urb) static void edge_bulk_in_callback(struct urb *urb)
{ {
struct edgeport_serial *edge_serial = urb->context; struct edgeport_serial *edge_serial = urb->context;
struct device *dev;
unsigned char *data = urb->transfer_buffer; unsigned char *data = urb->transfer_buffer;
int retval; int retval;
__u16 raw_data_length; __u16 raw_data_length;
int status = urb->status; int status = urb->status;
dbg("%s", __func__);
if (status) { if (status) {
dbg("%s - nonzero read bulk status received: %d", dev_dbg(&urb->dev->dev, "%s - nonzero read bulk status received: %d\n",
__func__, status); __func__, status);
edge_serial->read_in_progress = false; edge_serial->read_in_progress = false;
return; return;
} }
if (urb->actual_length == 0) { if (urb->actual_length == 0) {
dbg("%s - read bulk callback with no data", __func__); dev_dbg(&urb->dev->dev, "%s - read bulk callback with no data\n", __func__);
edge_serial->read_in_progress = false; edge_serial->read_in_progress = false;
return; return;
} }
dev = &edge_serial->serial->dev->dev;
raw_data_length = urb->actual_length; raw_data_length = urb->actual_length;
usb_serial_debug_data(debug, &edge_serial->serial->dev->dev, usb_serial_debug_data(debug, dev, __func__, raw_data_length, data);
__func__, raw_data_length, data);
spin_lock(&edge_serial->es_lock); spin_lock(&edge_serial->es_lock);
/* decrement our rxBytes available by the number that we just got */ /* decrement our rxBytes available by the number that we just got */
edge_serial->rxBytesAvail -= raw_data_length; edge_serial->rxBytesAvail -= raw_data_length;
dbg("%s - Received = %d, rxBytesAvail %d", __func__, dev_dbg(dev, "%s - Received = %d, rxBytesAvail %d\n", __func__,
raw_data_length, edge_serial->rxBytesAvail); raw_data_length, edge_serial->rxBytesAvail);
process_rcvd_data(edge_serial, data, urb->actual_length); process_rcvd_data(edge_serial, data, urb->actual_length);
/* check to see if there's any more data for us to read */ /* check to see if there's any more data for us to read */
if (edge_serial->rxBytesAvail > 0) { if (edge_serial->rxBytesAvail > 0) {
dbg("%s - posting a read", __func__); dev_dbg(dev, "%s - posting a read\n", __func__);
retval = usb_submit_urb(edge_serial->read_urb, GFP_ATOMIC); retval = usb_submit_urb(edge_serial->read_urb, GFP_ATOMIC);
if (retval) { if (retval) {
dev_err(&urb->dev->dev, dev_err(dev,
"%s - usb_submit_urb(read bulk) failed, " "%s - usb_submit_urb(read bulk) failed, retval = %d\n",
"retval = %d\n", __func__, retval); __func__, retval);
edge_serial->read_in_progress = false; edge_serial->read_in_progress = false;
} }
} else { } else {
...@@ -737,10 +746,9 @@ static void edge_bulk_out_data_callback(struct urb *urb) ...@@ -737,10 +746,9 @@ static void edge_bulk_out_data_callback(struct urb *urb)
struct tty_struct *tty; struct tty_struct *tty;
int status = urb->status; int status = urb->status;
dbg("%s", __func__);
if (status) { if (status) {
dbg("%s - nonzero write bulk status received: %d", dev_dbg(&urb->dev->dev,
"%s - nonzero write bulk status received: %d\n",
__func__, status); __func__, status);
} }
...@@ -773,11 +781,9 @@ static void edge_bulk_out_cmd_callback(struct urb *urb) ...@@ -773,11 +781,9 @@ static void edge_bulk_out_cmd_callback(struct urb *urb)
struct tty_struct *tty; struct tty_struct *tty;
int status = urb->status; int status = urb->status;
dbg("%s", __func__);
atomic_dec(&CmdUrbs); atomic_dec(&CmdUrbs);
dbg("%s - FREE URB %p (outstanding %d)", __func__, dev_dbg(&urb->dev->dev, "%s - FREE URB %p (outstanding %d)\n",
urb, atomic_read(&CmdUrbs)); __func__, urb, atomic_read(&CmdUrbs));
/* clean up the transfer buffer */ /* clean up the transfer buffer */
...@@ -787,7 +793,8 @@ static void edge_bulk_out_cmd_callback(struct urb *urb) ...@@ -787,7 +793,8 @@ static void edge_bulk_out_cmd_callback(struct urb *urb)
usb_free_urb(urb); usb_free_urb(urb);
if (status) { if (status) {
dbg("%s - nonzero write bulk status received: %d", dev_dbg(&urb->dev->dev,
"%s - nonzero write bulk status received: %d\n",
__func__, status); __func__, status);
return; return;
} }
...@@ -819,12 +826,11 @@ static void edge_bulk_out_cmd_callback(struct urb *urb) ...@@ -819,12 +826,11 @@ static void edge_bulk_out_cmd_callback(struct urb *urb)
static int edge_open(struct tty_struct *tty, struct usb_serial_port *port) static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
{ {
struct edgeport_port *edge_port = usb_get_serial_port_data(port); struct edgeport_port *edge_port = usb_get_serial_port_data(port);
struct device *dev = &port->dev;
struct usb_serial *serial; struct usb_serial *serial;
struct edgeport_serial *edge_serial; struct edgeport_serial *edge_serial;
int response; int response;
dbg("%s - port %d", __func__, port->number);
if (edge_port == NULL) if (edge_port == NULL)
return -ENODEV; return -ENODEV;
...@@ -875,8 +881,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -875,8 +881,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
response = usb_submit_urb(edge_serial->interrupt_read_urb, response = usb_submit_urb(edge_serial->interrupt_read_urb,
GFP_KERNEL); GFP_KERNEL);
if (response) { if (response) {
dev_err(&port->dev, dev_err(dev, "%s - Error %d submitting control urb\n",
"%s - Error %d submitting control urb\n",
__func__, response); __func__, response);
} }
} }
...@@ -902,8 +907,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -902,8 +907,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
response = send_iosp_ext_cmd(edge_port, IOSP_CMD_OPEN_PORT, 0); response = send_iosp_ext_cmd(edge_port, IOSP_CMD_OPEN_PORT, 0);
if (response < 0) { if (response < 0) {
dev_err(&port->dev, "%s - error sending open port command\n", dev_err(dev, "%s - error sending open port command\n", __func__);
__func__);
edge_port->openPending = false; edge_port->openPending = false;
return -ENODEV; return -ENODEV;
} }
...@@ -914,7 +918,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -914,7 +918,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
if (!edge_port->open) { if (!edge_port->open) {
/* open timed out */ /* open timed out */
dbg("%s - open timedout", __func__); dev_dbg(dev, "%s - open timedout\n", __func__);
edge_port->openPending = false; edge_port->openPending = false;
return -ENODEV; return -ENODEV;
} }
...@@ -927,7 +931,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -927,7 +931,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
edge_port->txfifo.fifo = kmalloc(edge_port->maxTxCredits, GFP_KERNEL); edge_port->txfifo.fifo = kmalloc(edge_port->maxTxCredits, GFP_KERNEL);
if (!edge_port->txfifo.fifo) { if (!edge_port->txfifo.fifo) {
dbg("%s - no memory", __func__); dev_dbg(dev, "%s - no memory\n", __func__);
edge_close(port); edge_close(port);
return -ENOMEM; return -ENOMEM;
} }
...@@ -937,16 +941,14 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -937,16 +941,14 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
edge_port->write_in_progress = false; edge_port->write_in_progress = false;
if (!edge_port->write_urb) { if (!edge_port->write_urb) {
dbg("%s - no memory", __func__); dev_dbg(dev, "%s - no memory\n", __func__);
edge_close(port); edge_close(port);
return -ENOMEM; return -ENOMEM;
} }
dbg("%s(%d) - Initialize TX fifo to %d bytes", dev_dbg(dev, "%s(%d) - Initialize TX fifo to %d bytes\n",
__func__, port->number, edge_port->maxTxCredits); __func__, port->number, edge_port->maxTxCredits);
dbg("%s exited", __func__);
return 0; return 0;
} }
...@@ -963,6 +965,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -963,6 +965,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
************************************************************************/ ************************************************************************/
static void block_until_chase_response(struct edgeport_port *edge_port) static void block_until_chase_response(struct edgeport_port *edge_port)
{ {
struct device *dev = &edge_port->port->dev;
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
__u16 lastCredits; __u16 lastCredits;
int timeout = 1*HZ; int timeout = 1*HZ;
...@@ -974,11 +977,11 @@ static void block_until_chase_response(struct edgeport_port *edge_port) ...@@ -974,11 +977,11 @@ static void block_until_chase_response(struct edgeport_port *edge_port)
/* Did we get our Chase response */ /* Did we get our Chase response */
if (!edge_port->chaseResponsePending) { if (!edge_port->chaseResponsePending) {
dbg("%s - Got Chase Response", __func__); dev_dbg(dev, "%s - Got Chase Response\n", __func__);
/* did we get all of our credit back? */ /* did we get all of our credit back? */
if (edge_port->txCredits == edge_port->maxTxCredits) { if (edge_port->txCredits == edge_port->maxTxCredits) {
dbg("%s - Got all credits", __func__); dev_dbg(dev, "%s - Got all credits\n", __func__);
return; return;
} }
} }
...@@ -994,12 +997,12 @@ static void block_until_chase_response(struct edgeport_port *edge_port) ...@@ -994,12 +997,12 @@ static void block_until_chase_response(struct edgeport_port *edge_port)
loop--; loop--;
if (loop == 0) { if (loop == 0) {
edge_port->chaseResponsePending = false; edge_port->chaseResponsePending = false;
dbg("%s - Chase TIMEOUT", __func__); dev_dbg(dev, "%s - Chase TIMEOUT\n", __func__);
return; return;
} }
} else { } else {
/* Reset timeout value back to 10 seconds */ /* Reset timeout value back to 10 seconds */
dbg("%s - Last %d, Current %d", __func__, dev_dbg(dev, "%s - Last %d, Current %d\n", __func__,
lastCredits, edge_port->txCredits); lastCredits, edge_port->txCredits);
loop = 10; loop = 10;
} }
...@@ -1019,6 +1022,7 @@ static void block_until_chase_response(struct edgeport_port *edge_port) ...@@ -1019,6 +1022,7 @@ static void block_until_chase_response(struct edgeport_port *edge_port)
************************************************************************/ ************************************************************************/
static void block_until_tx_empty(struct edgeport_port *edge_port) static void block_until_tx_empty(struct edgeport_port *edge_port)
{ {
struct device *dev = &edge_port->port->dev;
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
struct TxFifo *fifo = &edge_port->txfifo; struct TxFifo *fifo = &edge_port->txfifo;
__u32 lastCount; __u32 lastCount;
...@@ -1031,7 +1035,7 @@ static void block_until_tx_empty(struct edgeport_port *edge_port) ...@@ -1031,7 +1035,7 @@ static void block_until_tx_empty(struct edgeport_port *edge_port)
/* Is the Edgeport Buffer empty? */ /* Is the Edgeport Buffer empty? */
if (lastCount == 0) { if (lastCount == 0) {
dbg("%s - TX Buffer Empty", __func__); dev_dbg(dev, "%s - TX Buffer Empty\n", __func__);
return; return;
} }
...@@ -1041,13 +1045,13 @@ static void block_until_tx_empty(struct edgeport_port *edge_port) ...@@ -1041,13 +1045,13 @@ static void block_until_tx_empty(struct edgeport_port *edge_port)
schedule_timeout(timeout); schedule_timeout(timeout);
finish_wait(&edge_port->wait_chase, &wait); finish_wait(&edge_port->wait_chase, &wait);
dbg("%s wait", __func__); dev_dbg(dev, "%s wait\n", __func__);
if (lastCount == fifo->count) { if (lastCount == fifo->count) {
/* No activity.. count down. */ /* No activity.. count down. */
loop--; loop--;
if (loop == 0) { if (loop == 0) {
dbg("%s - TIMEOUT", __func__); dev_dbg(dev, "%s - TIMEOUT\n", __func__);
return; return;
} }
} else { } else {
...@@ -1068,8 +1072,6 @@ static void edge_close(struct usb_serial_port *port) ...@@ -1068,8 +1072,6 @@ static void edge_close(struct usb_serial_port *port)
struct edgeport_port *edge_port; struct edgeport_port *edge_port;
int status; int status;
dbg("%s - port %d", __func__, port->number);
edge_serial = usb_get_serial_data(port->serial); edge_serial = usb_get_serial_data(port->serial);
edge_port = usb_get_serial_port_data(port); edge_port = usb_get_serial_port_data(port);
if (edge_serial == NULL || edge_port == NULL) if (edge_serial == NULL || edge_port == NULL)
...@@ -1086,7 +1088,7 @@ static void edge_close(struct usb_serial_port *port) ...@@ -1086,7 +1088,7 @@ static void edge_close(struct usb_serial_port *port)
/* flush and chase */ /* flush and chase */
edge_port->chaseResponsePending = true; edge_port->chaseResponsePending = true;
dbg("%s - Sending IOSP_CMD_CHASE_PORT", __func__); dev_dbg(&port->dev, "%s - Sending IOSP_CMD_CHASE_PORT\n", __func__);
status = send_iosp_ext_cmd(edge_port, IOSP_CMD_CHASE_PORT, 0); status = send_iosp_ext_cmd(edge_port, IOSP_CMD_CHASE_PORT, 0);
if (status == 0) if (status == 0)
/* block until chase finished */ /* block until chase finished */
...@@ -1099,7 +1101,7 @@ static void edge_close(struct usb_serial_port *port) ...@@ -1099,7 +1101,7 @@ static void edge_close(struct usb_serial_port *port)
((edge_serial->is_epic) && ((edge_serial->is_epic) &&
(edge_serial->epic_descriptor.Supports.IOSPClose))) { (edge_serial->epic_descriptor.Supports.IOSPClose))) {
/* close the port */ /* close the port */
dbg("%s - Sending IOSP_CMD_CLOSE_PORT", __func__); dev_dbg(&port->dev, "%s - Sending IOSP_CMD_CLOSE_PORT\n", __func__);
send_iosp_ext_cmd(edge_port, IOSP_CMD_CLOSE_PORT, 0); send_iosp_ext_cmd(edge_port, IOSP_CMD_CLOSE_PORT, 0);
} }
...@@ -1119,8 +1121,6 @@ static void edge_close(struct usb_serial_port *port) ...@@ -1119,8 +1121,6 @@ static void edge_close(struct usb_serial_port *port)
} }
kfree(edge_port->txfifo.fifo); kfree(edge_port->txfifo.fifo);
edge_port->txfifo.fifo = NULL; edge_port->txfifo.fifo = NULL;
dbg("%s exited", __func__);
} }
/***************************************************************************** /*****************************************************************************
...@@ -1141,8 +1141,6 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -1141,8 +1141,6 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port,
int secondhalf; int secondhalf;
unsigned long flags; unsigned long flags;
dbg("%s - port %d", __func__, port->number);
if (edge_port == NULL) if (edge_port == NULL)
return -ENODEV; return -ENODEV;
...@@ -1155,14 +1153,14 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -1155,14 +1153,14 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port,
copySize = min((unsigned int)count, copySize = min((unsigned int)count,
(edge_port->txCredits - fifo->count)); (edge_port->txCredits - fifo->count));
dbg("%s(%d) of %d byte(s) Fifo room %d -- will copy %d bytes", dev_dbg(&port->dev, "%s(%d) of %d byte(s) Fifo room %d -- will copy %d bytes\n",
__func__, port->number, count, __func__, port->number, count,
edge_port->txCredits - fifo->count, copySize); edge_port->txCredits - fifo->count, copySize);
/* catch writes of 0 bytes which the tty driver likes to give us, /* catch writes of 0 bytes which the tty driver likes to give us,
and when txCredits is empty */ and when txCredits is empty */
if (copySize == 0) { if (copySize == 0) {
dbg("%s - copySize = Zero", __func__); dev_dbg(&port->dev, "%s - copySize = Zero\n", __func__);
goto finish_write; goto finish_write;
} }
...@@ -1175,7 +1173,7 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -1175,7 +1173,7 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port,
*/ */
bytesleft = fifo->size - fifo->head; bytesleft = fifo->size - fifo->head;
firsthalf = min(bytesleft, copySize); firsthalf = min(bytesleft, copySize);
dbg("%s - copy %d bytes of %d into fifo ", __func__, dev_dbg(&port->dev, "%s - copy %d bytes of %d into fifo \n", __func__,
firsthalf, bytesleft); firsthalf, bytesleft);
/* now copy our data */ /* now copy our data */
...@@ -1194,7 +1192,7 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -1194,7 +1192,7 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port,
secondhalf = copySize-firsthalf; secondhalf = copySize-firsthalf;
if (secondhalf) { if (secondhalf) {
dbg("%s - copy rest of data %d", __func__, secondhalf); dev_dbg(&port->dev, "%s - copy rest of data %d\n", __func__, secondhalf);
memcpy(&fifo->fifo[fifo->head], &data[firsthalf], secondhalf); memcpy(&fifo->fifo[fifo->head], &data[firsthalf], secondhalf);
usb_serial_debug_data(debug, &port->dev, __func__, usb_serial_debug_data(debug, &port->dev, __func__,
secondhalf, &fifo->fifo[fifo->head]); secondhalf, &fifo->fifo[fifo->head]);
...@@ -1212,8 +1210,8 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -1212,8 +1210,8 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port,
send_more_port_data((struct edgeport_serial *) send_more_port_data((struct edgeport_serial *)
usb_get_serial_data(port->serial), edge_port); usb_get_serial_data(port->serial), edge_port);
dbg("%s wrote %d byte(s) TxCredits %d, Fifo %d", __func__, dev_dbg(&port->dev, "%s wrote %d byte(s) TxCredits %d, Fifo %d\n",
copySize, edge_port->txCredits, fifo->count); __func__, copySize, edge_port->txCredits, fifo->count);
return copySize; return copySize;
} }
...@@ -1236,6 +1234,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial, ...@@ -1236,6 +1234,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
struct edgeport_port *edge_port) struct edgeport_port *edge_port)
{ {
struct TxFifo *fifo = &edge_port->txfifo; struct TxFifo *fifo = &edge_port->txfifo;
struct device *dev = &edge_port->port->dev;
struct urb *urb; struct urb *urb;
unsigned char *buffer; unsigned char *buffer;
int status; int status;
...@@ -1245,14 +1244,12 @@ static void send_more_port_data(struct edgeport_serial *edge_serial, ...@@ -1245,14 +1244,12 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
int secondhalf; int secondhalf;
unsigned long flags; unsigned long flags;
dbg("%s(%d)", __func__, edge_port->port->number);
spin_lock_irqsave(&edge_port->ep_lock, flags); spin_lock_irqsave(&edge_port->ep_lock, flags);
if (edge_port->write_in_progress || if (edge_port->write_in_progress ||
!edge_port->open || !edge_port->open ||
(fifo->count == 0)) { (fifo->count == 0)) {
dbg("%s(%d) EXIT - fifo %d, PendingWrite = %d", dev_dbg(dev, "%s(%d) EXIT - fifo %d, PendingWrite = %d\n",
__func__, edge_port->port->number, __func__, edge_port->port->number,
fifo->count, edge_port->write_in_progress); fifo->count, edge_port->write_in_progress);
goto exit_send; goto exit_send;
...@@ -1266,7 +1263,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial, ...@@ -1266,7 +1263,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
* it's better to wait for more credits so we can do a larger write. * it's better to wait for more credits so we can do a larger write.
*/ */
if (edge_port->txCredits < EDGE_FW_GET_TX_CREDITS_SEND_THRESHOLD(edge_port->maxTxCredits, EDGE_FW_BULK_MAX_PACKET_SIZE)) { if (edge_port->txCredits < EDGE_FW_GET_TX_CREDITS_SEND_THRESHOLD(edge_port->maxTxCredits, EDGE_FW_BULK_MAX_PACKET_SIZE)) {
dbg("%s(%d) Not enough credit - fifo %d TxCredit %d", dev_dbg(dev, "%s(%d) Not enough credit - fifo %d TxCredit %d\n",
__func__, edge_port->port->number, fifo->count, __func__, edge_port->port->number, fifo->count,
edge_port->txCredits); edge_port->txCredits);
goto exit_send; goto exit_send;
...@@ -1341,7 +1338,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial, ...@@ -1341,7 +1338,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
edge_port->txCredits += count; edge_port->txCredits += count;
edge_port->icount.tx -= count; edge_port->icount.tx -= count;
} }
dbg("%s wrote %d byte(s) TxCredit %d, Fifo %d", dev_dbg(dev, "%s wrote %d byte(s) TxCredit %d, Fifo %d\n",
__func__, count, edge_port->txCredits, fifo->count); __func__, count, edge_port->txCredits, fifo->count);
exit_send: exit_send:
...@@ -1363,17 +1360,13 @@ static int edge_write_room(struct tty_struct *tty) ...@@ -1363,17 +1360,13 @@ static int edge_write_room(struct tty_struct *tty)
int room; int room;
unsigned long flags; unsigned long flags;
dbg("%s", __func__);
if (edge_port == NULL) if (edge_port == NULL)
return 0; return 0;
if (edge_port->closePending) if (edge_port->closePending)
return 0; return 0;
dbg("%s - port %d", __func__, port->number);
if (!edge_port->open) { if (!edge_port->open) {
dbg("%s - port not opened", __func__); dev_dbg(&port->dev, "%s - port not opened\n", __func__);
return 0; return 0;
} }
...@@ -1382,7 +1375,7 @@ static int edge_write_room(struct tty_struct *tty) ...@@ -1382,7 +1375,7 @@ static int edge_write_room(struct tty_struct *tty)
room = edge_port->txCredits - edge_port->txfifo.count; room = edge_port->txCredits - edge_port->txfifo.count;
spin_unlock_irqrestore(&edge_port->ep_lock, flags); spin_unlock_irqrestore(&edge_port->ep_lock, flags);
dbg("%s - returns %d", __func__, room); dev_dbg(&port->dev, "%s - returns %d\n", __func__, room);
return room; return room;
} }
...@@ -1403,15 +1396,13 @@ static int edge_chars_in_buffer(struct tty_struct *tty) ...@@ -1403,15 +1396,13 @@ static int edge_chars_in_buffer(struct tty_struct *tty)
int num_chars; int num_chars;
unsigned long flags; unsigned long flags;
dbg("%s", __func__);
if (edge_port == NULL) if (edge_port == NULL)
return 0; return 0;
if (edge_port->closePending) if (edge_port->closePending)
return 0; return 0;
if (!edge_port->open) { if (!edge_port->open) {
dbg("%s - port not opened", __func__); dev_dbg(&port->dev, "%s - port not opened\n", __func__);
return 0; return 0;
} }
...@@ -1420,7 +1411,7 @@ static int edge_chars_in_buffer(struct tty_struct *tty) ...@@ -1420,7 +1411,7 @@ static int edge_chars_in_buffer(struct tty_struct *tty)
edge_port->txfifo.count; edge_port->txfifo.count;
spin_unlock_irqrestore(&edge_port->ep_lock, flags); spin_unlock_irqrestore(&edge_port->ep_lock, flags);
if (num_chars) { if (num_chars) {
dbg("%s(port %d) - returns %d", __func__, dev_dbg(&port->dev, "%s(port %d) - returns %d\n", __func__,
port->number, num_chars); port->number, num_chars);
} }
...@@ -1439,13 +1430,11 @@ static void edge_throttle(struct tty_struct *tty) ...@@ -1439,13 +1430,11 @@ static void edge_throttle(struct tty_struct *tty)
struct edgeport_port *edge_port = usb_get_serial_port_data(port); struct edgeport_port *edge_port = usb_get_serial_port_data(port);
int status; int status;
dbg("%s - port %d", __func__, port->number);
if (edge_port == NULL) if (edge_port == NULL)
return; return;
if (!edge_port->open) { if (!edge_port->open) {
dbg("%s - port not opened", __func__); dev_dbg(&port->dev, "%s - port not opened\n", __func__);
return; return;
} }
...@@ -1479,13 +1468,11 @@ static void edge_unthrottle(struct tty_struct *tty) ...@@ -1479,13 +1468,11 @@ static void edge_unthrottle(struct tty_struct *tty)
struct edgeport_port *edge_port = usb_get_serial_port_data(port); struct edgeport_port *edge_port = usb_get_serial_port_data(port);
int status; int status;
dbg("%s - port %d", __func__, port->number);
if (edge_port == NULL) if (edge_port == NULL)
return; return;
if (!edge_port->open) { if (!edge_port->open) {
dbg("%s - port not opened", __func__); dev_dbg(&port->dev, "%s - port not opened\n", __func__);
return; return;
} }
...@@ -1517,18 +1504,14 @@ static void edge_set_termios(struct tty_struct *tty, ...@@ -1517,18 +1504,14 @@ static void edge_set_termios(struct tty_struct *tty,
unsigned int cflag; unsigned int cflag;
cflag = tty->termios->c_cflag; cflag = tty->termios->c_cflag;
dbg("%s - clfag %08x iflag %08x", __func__, dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__, tty->termios->c_cflag, tty->termios->c_iflag);
tty->termios->c_cflag, tty->termios->c_iflag); dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__, old_termios->c_cflag, old_termios->c_iflag);
dbg("%s - old clfag %08x old iflag %08x", __func__,
old_termios->c_cflag, old_termios->c_iflag);
dbg("%s - port %d", __func__, port->number);
if (edge_port == NULL) if (edge_port == NULL)
return; return;
if (!edge_port->open) { if (!edge_port->open) {
dbg("%s - port not opened", __func__); dev_dbg(&port->dev, "%s - port not opened\n", __func__);
return; return;
} }
...@@ -1556,7 +1539,7 @@ static int get_lsr_info(struct edgeport_port *edge_port, ...@@ -1556,7 +1539,7 @@ static int get_lsr_info(struct edgeport_port *edge_port,
spin_lock_irqsave(&edge_port->ep_lock, flags); spin_lock_irqsave(&edge_port->ep_lock, flags);
if (edge_port->maxTxCredits == edge_port->txCredits && if (edge_port->maxTxCredits == edge_port->txCredits &&
edge_port->txfifo.count == 0) { edge_port->txfifo.count == 0) {
dbg("%s -- Empty", __func__); dev_dbg(&edge_port->port->dev, "%s -- Empty\n", __func__);
result = TIOCSER_TEMT; result = TIOCSER_TEMT;
} }
spin_unlock_irqrestore(&edge_port->ep_lock, flags); spin_unlock_irqrestore(&edge_port->ep_lock, flags);
...@@ -1573,8 +1556,6 @@ static int edge_tiocmset(struct tty_struct *tty, ...@@ -1573,8 +1556,6 @@ static int edge_tiocmset(struct tty_struct *tty,
struct edgeport_port *edge_port = usb_get_serial_port_data(port); struct edgeport_port *edge_port = usb_get_serial_port_data(port);
unsigned int mcr; unsigned int mcr;
dbg("%s - port %d", __func__, port->number);
mcr = edge_port->shadowMCR; mcr = edge_port->shadowMCR;
if (set & TIOCM_RTS) if (set & TIOCM_RTS)
mcr |= MCR_RTS; mcr |= MCR_RTS;
...@@ -1605,8 +1586,6 @@ static int edge_tiocmget(struct tty_struct *tty) ...@@ -1605,8 +1586,6 @@ static int edge_tiocmget(struct tty_struct *tty)
unsigned int msr; unsigned int msr;
unsigned int mcr; unsigned int mcr;
dbg("%s - port %d", __func__, port->number);
msr = edge_port->shadowMSR; msr = edge_port->shadowMSR;
mcr = edge_port->shadowMCR; mcr = edge_port->shadowMCR;
result = ((mcr & MCR_DTR) ? TIOCM_DTR: 0) /* 0x002 */ result = ((mcr & MCR_DTR) ? TIOCM_DTR: 0) /* 0x002 */
...@@ -1616,9 +1595,6 @@ static int edge_tiocmget(struct tty_struct *tty) ...@@ -1616,9 +1595,6 @@ static int edge_tiocmget(struct tty_struct *tty)
| ((msr & EDGEPORT_MSR_RI) ? TIOCM_RI: 0) /* 0x080 */ | ((msr & EDGEPORT_MSR_RI) ? TIOCM_RI: 0) /* 0x080 */
| ((msr & EDGEPORT_MSR_DSR) ? TIOCM_DSR: 0); /* 0x100 */ | ((msr & EDGEPORT_MSR_DSR) ? TIOCM_DSR: 0); /* 0x100 */
dbg("%s -- %x", __func__, result);
return result; return result;
} }
...@@ -1642,8 +1618,8 @@ static int edge_get_icount(struct tty_struct *tty, ...@@ -1642,8 +1618,8 @@ static int edge_get_icount(struct tty_struct *tty,
icount->brk = cnow.brk; icount->brk = cnow.brk;
icount->buf_overrun = cnow.buf_overrun; icount->buf_overrun = cnow.buf_overrun;
dbg("%s (%d) TIOCGICOUNT RX=%d, TX=%d", dev_dbg(&port->dev, "%s (%d) TIOCGICOUNT RX=%d, TX=%d\n", __func__,
__func__, port->number, icount->rx, icount->tx); port->number, icount->rx, icount->tx);
return 0; return 0;
} }
...@@ -1686,19 +1662,19 @@ static int edge_ioctl(struct tty_struct *tty, ...@@ -1686,19 +1662,19 @@ static int edge_ioctl(struct tty_struct *tty,
struct async_icount cnow; struct async_icount cnow;
struct async_icount cprev; struct async_icount cprev;
dbg("%s - port %d, cmd = 0x%x", __func__, port->number, cmd); dev_dbg(&port->dev, "%s - port %d, cmd = 0x%x\n", __func__, port->number, cmd);
switch (cmd) { switch (cmd) {
case TIOCSERGETLSR: case TIOCSERGETLSR:
dbg("%s (%d) TIOCSERGETLSR", __func__, port->number); dev_dbg(&port->dev, "%s (%d) TIOCSERGETLSR\n", __func__, port->number);
return get_lsr_info(edge_port, (unsigned int __user *) arg); return get_lsr_info(edge_port, (unsigned int __user *) arg);
case TIOCGSERIAL: case TIOCGSERIAL:
dbg("%s (%d) TIOCGSERIAL", __func__, port->number); dev_dbg(&port->dev, "%s (%d) TIOCGSERIAL\n", __func__, port->number);
return get_serial_info(edge_port, (struct serial_struct __user *) arg); return get_serial_info(edge_port, (struct serial_struct __user *) arg);
case TIOCMIWAIT: case TIOCMIWAIT:
dbg("%s (%d) TIOCMIWAIT", __func__, port->number); dev_dbg(&port->dev, "%s (%d) TIOCMIWAIT\n", __func__, port->number);
cprev = edge_port->icount; cprev = edge_port->icount;
while (1) { while (1) {
prepare_to_wait(&edge_port->delta_msr_wait, prepare_to_wait(&edge_port->delta_msr_wait,
...@@ -1745,7 +1721,7 @@ static void edge_break(struct tty_struct *tty, int break_state) ...@@ -1745,7 +1721,7 @@ static void edge_break(struct tty_struct *tty, int break_state)
/* flush and chase */ /* flush and chase */
edge_port->chaseResponsePending = true; edge_port->chaseResponsePending = true;
dbg("%s - Sending IOSP_CMD_CHASE_PORT", __func__); dev_dbg(&port->dev, "%s - Sending IOSP_CMD_CHASE_PORT\n", __func__);
status = send_iosp_ext_cmd(edge_port, IOSP_CMD_CHASE_PORT, 0); status = send_iosp_ext_cmd(edge_port, IOSP_CMD_CHASE_PORT, 0);
if (status == 0) { if (status == 0) {
/* block until chase finished */ /* block until chase finished */
...@@ -1759,16 +1735,16 @@ static void edge_break(struct tty_struct *tty, int break_state) ...@@ -1759,16 +1735,16 @@ static void edge_break(struct tty_struct *tty, int break_state)
((edge_serial->is_epic) && ((edge_serial->is_epic) &&
(edge_serial->epic_descriptor.Supports.IOSPSetClrBreak))) { (edge_serial->epic_descriptor.Supports.IOSPSetClrBreak))) {
if (break_state == -1) { if (break_state == -1) {
dbg("%s - Sending IOSP_CMD_SET_BREAK", __func__); dev_dbg(&port->dev, "%s - Sending IOSP_CMD_SET_BREAK\n", __func__);
status = send_iosp_ext_cmd(edge_port, status = send_iosp_ext_cmd(edge_port,
IOSP_CMD_SET_BREAK, 0); IOSP_CMD_SET_BREAK, 0);
} else { } else {
dbg("%s - Sending IOSP_CMD_CLEAR_BREAK", __func__); dev_dbg(&port->dev, "%s - Sending IOSP_CMD_CLEAR_BREAK\n", __func__);
status = send_iosp_ext_cmd(edge_port, status = send_iosp_ext_cmd(edge_port,
IOSP_CMD_CLEAR_BREAK, 0); IOSP_CMD_CLEAR_BREAK, 0);
} }
if (status) if (status)
dbg("%s - error sending break set/clear command.", dev_dbg(&port->dev, "%s - error sending break set/clear command.\n",
__func__); __func__);
} }
} }
...@@ -1781,20 +1757,19 @@ static void edge_break(struct tty_struct *tty, int break_state) ...@@ -1781,20 +1757,19 @@ static void edge_break(struct tty_struct *tty, int break_state)
static void process_rcvd_data(struct edgeport_serial *edge_serial, static void process_rcvd_data(struct edgeport_serial *edge_serial,
unsigned char *buffer, __u16 bufferLength) unsigned char *buffer, __u16 bufferLength)
{ {
struct device *dev = &edge_serial->serial->dev->dev;
struct usb_serial_port *port; struct usb_serial_port *port;
struct edgeport_port *edge_port; struct edgeport_port *edge_port;
struct tty_struct *tty; struct tty_struct *tty;
__u16 lastBufferLength; __u16 lastBufferLength;
__u16 rxLen; __u16 rxLen;
dbg("%s", __func__);
lastBufferLength = bufferLength + 1; lastBufferLength = bufferLength + 1;
while (bufferLength > 0) { while (bufferLength > 0) {
/* failsafe incase we get a message that we don't understand */ /* failsafe incase we get a message that we don't understand */
if (lastBufferLength == bufferLength) { if (lastBufferLength == bufferLength) {
dbg("%s - stuck in loop, exiting it.", __func__); dev_dbg(dev, "%s - stuck in loop, exiting it.\n", __func__);
break; break;
} }
lastBufferLength = bufferLength; lastBufferLength = bufferLength;
...@@ -1815,7 +1790,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial, ...@@ -1815,7 +1790,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,
++buffer; ++buffer;
--bufferLength; --bufferLength;
dbg("%s - Hdr1=%02X Hdr2=%02X", __func__, dev_dbg(dev, "%s - Hdr1=%02X Hdr2=%02X\n", __func__,
edge_serial->rxHeader1, edge_serial->rxHeader2); edge_serial->rxHeader1, edge_serial->rxHeader2);
/* Process depending on whether this header is /* Process depending on whether this header is
* data or status */ * data or status */
...@@ -1855,7 +1830,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial, ...@@ -1855,7 +1830,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,
IOSP_GET_HDR_DATA_LEN( IOSP_GET_HDR_DATA_LEN(
edge_serial->rxHeader1, edge_serial->rxHeader1,
edge_serial->rxHeader2); edge_serial->rxHeader2);
dbg("%s - Data for Port %u Len %u", dev_dbg(dev, "%s - Data for Port %u Len %u\n",
__func__, __func__,
edge_serial->rxPort, edge_serial->rxPort,
edge_serial->rxBytesRemaining); edge_serial->rxBytesRemaining);
...@@ -1896,7 +1871,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial, ...@@ -1896,7 +1871,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,
tty = tty_port_tty_get( tty = tty_port_tty_get(
&edge_port->port->port); &edge_port->port->port);
if (tty) { if (tty) {
dbg("%s - Sending %d bytes to TTY for port %d", dev_dbg(dev, "%s - Sending %d bytes to TTY for port %d\n",
__func__, rxLen, edge_serial->rxPort); __func__, rxLen, edge_serial->rxPort);
edge_tty_recv(&edge_serial->serial->dev->dev, tty, buffer, rxLen); edge_tty_recv(&edge_serial->serial->dev->dev, tty, buffer, rxLen);
tty_kref_put(tty); tty_kref_put(tty);
...@@ -1935,6 +1910,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial, ...@@ -1935,6 +1910,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
struct usb_serial_port *port; struct usb_serial_port *port;
struct edgeport_port *edge_port; struct edgeport_port *edge_port;
struct tty_struct *tty; struct tty_struct *tty;
struct device *dev;
__u8 code = edge_serial->rxStatusCode; __u8 code = edge_serial->rxStatusCode;
/* switch the port pointer to the one being currently talked about */ /* switch the port pointer to the one being currently talked about */
...@@ -1946,15 +1922,14 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial, ...@@ -1946,15 +1922,14 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
__func__, edge_serial->rxPort); __func__, edge_serial->rxPort);
return; return;
} }
dev = &port->dev;
dbg("%s - port %d", __func__, edge_serial->rxPort);
if (code == IOSP_EXT_STATUS) { if (code == IOSP_EXT_STATUS) {
switch (byte2) { switch (byte2) {
case IOSP_EXT_STATUS_CHASE_RSP: case IOSP_EXT_STATUS_CHASE_RSP:
/* we want to do EXT status regardless of port /* we want to do EXT status regardless of port
* open/closed */ * open/closed */
dbg("%s - Port %u EXT CHASE_RSP Data = %02x", dev_dbg(dev, "%s - Port %u EXT CHASE_RSP Data = %02x\n",
__func__, edge_serial->rxPort, byte3); __func__, edge_serial->rxPort, byte3);
/* Currently, the only EXT_STATUS is Chase, so process /* Currently, the only EXT_STATUS is Chase, so process
* here instead of one more call to one more subroutine * here instead of one more call to one more subroutine
...@@ -1970,7 +1945,8 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial, ...@@ -1970,7 +1945,8 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
return; return;
case IOSP_EXT_STATUS_RX_CHECK_RSP: case IOSP_EXT_STATUS_RX_CHECK_RSP:
dbg("%s ========== Port %u CHECK_RSP Sequence = %02x =============", __func__, edge_serial->rxPort, byte3); dev_dbg(dev, "%s ========== Port %u CHECK_RSP Sequence = %02x =============\n",
__func__, edge_serial->rxPort, byte3);
/* Port->RxCheckRsp = true; */ /* Port->RxCheckRsp = true; */
return; return;
} }
...@@ -1979,7 +1955,8 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial, ...@@ -1979,7 +1955,8 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
if (code == IOSP_STATUS_OPEN_RSP) { if (code == IOSP_STATUS_OPEN_RSP) {
edge_port->txCredits = GET_TX_BUFFER_SIZE(byte3); edge_port->txCredits = GET_TX_BUFFER_SIZE(byte3);
edge_port->maxTxCredits = edge_port->txCredits; edge_port->maxTxCredits = edge_port->txCredits;
dbg("%s - Port %u Open Response Initial MSR = %02x TxBufferSize = %d", __func__, edge_serial->rxPort, byte2, edge_port->txCredits); dev_dbg(dev, "%s - Port %u Open Response Initial MSR = %02x TxBufferSize = %d\n",
__func__, edge_serial->rxPort, byte2, edge_port->txCredits);
handle_new_msr(edge_port, byte2); handle_new_msr(edge_port, byte2);
/* send the current line settings to the port so we are /* send the current line settings to the port so we are
...@@ -2008,13 +1985,13 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial, ...@@ -2008,13 +1985,13 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
switch (code) { switch (code) {
/* Not currently sent by Edgeport */ /* Not currently sent by Edgeport */
case IOSP_STATUS_LSR: case IOSP_STATUS_LSR:
dbg("%s - Port %u LSR Status = %02x", dev_dbg(dev, "%s - Port %u LSR Status = %02x\n",
__func__, edge_serial->rxPort, byte2); __func__, edge_serial->rxPort, byte2);
handle_new_lsr(edge_port, false, byte2, 0); handle_new_lsr(edge_port, false, byte2, 0);
break; break;
case IOSP_STATUS_LSR_DATA: case IOSP_STATUS_LSR_DATA:
dbg("%s - Port %u LSR Status = %02x, Data = %02x", dev_dbg(dev, "%s - Port %u LSR Status = %02x, Data = %02x\n",
__func__, edge_serial->rxPort, byte2, byte3); __func__, edge_serial->rxPort, byte2, byte3);
/* byte2 is LSR Register */ /* byte2 is LSR Register */
/* byte3 is broken data byte */ /* byte3 is broken data byte */
...@@ -2022,12 +1999,12 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial, ...@@ -2022,12 +1999,12 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
break; break;
/* /*
* case IOSP_EXT_4_STATUS: * case IOSP_EXT_4_STATUS:
* dbg("%s - Port %u LSR Status = %02x Data = %02x", * dev_dbg(dev, "%s - Port %u LSR Status = %02x Data = %02x\n",
* __func__, edge_serial->rxPort, byte2, byte3); * __func__, edge_serial->rxPort, byte2, byte3);
* break; * break;
*/ */
case IOSP_STATUS_MSR: case IOSP_STATUS_MSR:
dbg("%s - Port %u MSR Status = %02x", dev_dbg(dev, "%s - Port %u MSR Status = %02x\n",
__func__, edge_serial->rxPort, byte2); __func__, edge_serial->rxPort, byte2);
/* /*
* Process this new modem status and generate appropriate * Process this new modem status and generate appropriate
...@@ -2038,7 +2015,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial, ...@@ -2038,7 +2015,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
break; break;
default: default:
dbg("%s - Unrecognized IOSP status code %u", __func__, code); dev_dbg(dev, "%s - Unrecognized IOSP status code %u\n", __func__, code);
break; break;
} }
} }
...@@ -2073,8 +2050,6 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 newMsr) ...@@ -2073,8 +2050,6 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 newMsr)
{ {
struct async_icount *icount; struct async_icount *icount;
dbg("%s %02x", __func__, newMsr);
if (newMsr & (EDGEPORT_MSR_DELTA_CTS | EDGEPORT_MSR_DELTA_DSR | if (newMsr & (EDGEPORT_MSR_DELTA_CTS | EDGEPORT_MSR_DELTA_DSR |
EDGEPORT_MSR_DELTA_RI | EDGEPORT_MSR_DELTA_CD)) { EDGEPORT_MSR_DELTA_RI | EDGEPORT_MSR_DELTA_CD)) {
icount = &edge_port->icount; icount = &edge_port->icount;
...@@ -2107,8 +2082,6 @@ static void handle_new_lsr(struct edgeport_port *edge_port, __u8 lsrData, ...@@ -2107,8 +2082,6 @@ static void handle_new_lsr(struct edgeport_port *edge_port, __u8 lsrData,
(LSR_OVER_ERR | LSR_PAR_ERR | LSR_FRM_ERR | LSR_BREAK)); (LSR_OVER_ERR | LSR_PAR_ERR | LSR_FRM_ERR | LSR_BREAK));
struct async_icount *icount; struct async_icount *icount;
dbg("%s - %02x", __func__, newLsr);
edge_port->shadowLSR = lsr; edge_port->shadowLSR = lsr;
if (newLsr & LSR_BREAK) { if (newLsr & LSR_BREAK) {
...@@ -2156,7 +2129,7 @@ static int sram_write(struct usb_serial *serial, __u16 extAddr, __u16 addr, ...@@ -2156,7 +2129,7 @@ static int sram_write(struct usb_serial *serial, __u16 extAddr, __u16 addr,
__u16 current_length; __u16 current_length;
unsigned char *transfer_buffer; unsigned char *transfer_buffer;
dbg("%s - %x, %x, %d", __func__, extAddr, addr, length); dev_dbg(&serial->dev->dev, "%s - %x, %x, %d\n", __func__, extAddr, addr, length);
transfer_buffer = kmalloc(64, GFP_KERNEL); transfer_buffer = kmalloc(64, GFP_KERNEL);
if (!transfer_buffer) { if (!transfer_buffer) {
...@@ -2173,8 +2146,7 @@ static int sram_write(struct usb_serial *serial, __u16 extAddr, __u16 addr, ...@@ -2173,8 +2146,7 @@ static int sram_write(struct usb_serial *serial, __u16 extAddr, __u16 addr,
else else
current_length = length; current_length = length;
/* dbg("%s - writing %x, %x, %d", __func__, /* dev_dbg(&serial->dev->dev, "%s - writing %x, %x, %d\n", __func__, extAddr, addr, current_length); */
extAddr, addr, current_length); */
memcpy(transfer_buffer, data, current_length); memcpy(transfer_buffer, data, current_length);
result = usb_control_msg(serial->dev, result = usb_control_msg(serial->dev,
usb_sndctrlpipe(serial->dev, 0), usb_sndctrlpipe(serial->dev, 0),
...@@ -2207,8 +2179,6 @@ static int rom_write(struct usb_serial *serial, __u16 extAddr, __u16 addr, ...@@ -2207,8 +2179,6 @@ static int rom_write(struct usb_serial *serial, __u16 extAddr, __u16 addr,
__u16 current_length; __u16 current_length;
unsigned char *transfer_buffer; unsigned char *transfer_buffer;
/* dbg("%s - %x, %x, %d", __func__, extAddr, addr, length); */
transfer_buffer = kmalloc(64, GFP_KERNEL); transfer_buffer = kmalloc(64, GFP_KERNEL);
if (!transfer_buffer) { if (!transfer_buffer) {
dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n",
...@@ -2223,8 +2193,6 @@ static int rom_write(struct usb_serial *serial, __u16 extAddr, __u16 addr, ...@@ -2223,8 +2193,6 @@ static int rom_write(struct usb_serial *serial, __u16 extAddr, __u16 addr,
current_length = 64; current_length = 64;
else else
current_length = length; current_length = length;
/* dbg("%s - writing %x, %x, %d", __func__,
extAddr, addr, current_length); */
memcpy(transfer_buffer, data, current_length); memcpy(transfer_buffer, data, current_length);
result = usb_control_msg(serial->dev, result = usb_control_msg(serial->dev,
usb_sndctrlpipe(serial->dev, 0), usb_sndctrlpipe(serial->dev, 0),
...@@ -2257,8 +2225,6 @@ static int rom_read(struct usb_serial *serial, __u16 extAddr, ...@@ -2257,8 +2225,6 @@ static int rom_read(struct usb_serial *serial, __u16 extAddr,
__u16 current_length; __u16 current_length;
unsigned char *transfer_buffer; unsigned char *transfer_buffer;
dbg("%s - %x, %x, %d", __func__, extAddr, addr, length);
transfer_buffer = kmalloc(64, GFP_KERNEL); transfer_buffer = kmalloc(64, GFP_KERNEL);
if (!transfer_buffer) { if (!transfer_buffer) {
dev_err(&serial->dev->dev, dev_err(&serial->dev->dev,
...@@ -2273,8 +2239,6 @@ static int rom_read(struct usb_serial *serial, __u16 extAddr, ...@@ -2273,8 +2239,6 @@ static int rom_read(struct usb_serial *serial, __u16 extAddr,
current_length = 64; current_length = 64;
else else
current_length = length; current_length = length;
/* dbg("%s - %x, %x, %d", __func__,
extAddr, addr, current_length); */
result = usb_control_msg(serial->dev, result = usb_control_msg(serial->dev,
usb_rcvctrlpipe(serial->dev, 0), usb_rcvctrlpipe(serial->dev, 0),
USB_REQUEST_ION_READ_ROM, USB_REQUEST_ION_READ_ROM,
...@@ -2305,8 +2269,6 @@ static int send_iosp_ext_cmd(struct edgeport_port *edge_port, ...@@ -2305,8 +2269,6 @@ static int send_iosp_ext_cmd(struct edgeport_port *edge_port,
int length = 0; int length = 0;
int status = 0; int status = 0;
dbg("%s - %d, %d", __func__, command, param);
buffer = kmalloc(10, GFP_ATOMIC); buffer = kmalloc(10, GFP_ATOMIC);
if (!buffer) { if (!buffer) {
dev_err(&edge_port->port->dev, dev_err(&edge_port->port->dev,
...@@ -2339,11 +2301,11 @@ static int write_cmd_usb(struct edgeport_port *edge_port, ...@@ -2339,11 +2301,11 @@ static int write_cmd_usb(struct edgeport_port *edge_port,
{ {
struct edgeport_serial *edge_serial = struct edgeport_serial *edge_serial =
usb_get_serial_data(edge_port->port->serial); usb_get_serial_data(edge_port->port->serial);
struct device *dev = &edge_port->port->dev;
int status = 0; int status = 0;
struct urb *urb; struct urb *urb;
usb_serial_debug_data(debug, &edge_port->port->dev, usb_serial_debug_data(debug, dev, __func__, length, buffer);
__func__, length, buffer);
/* Allocate our next urb */ /* Allocate our next urb */
urb = usb_alloc_urb(0, GFP_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC);
...@@ -2351,7 +2313,7 @@ static int write_cmd_usb(struct edgeport_port *edge_port, ...@@ -2351,7 +2313,7 @@ static int write_cmd_usb(struct edgeport_port *edge_port,
return -ENOMEM; return -ENOMEM;
atomic_inc(&CmdUrbs); atomic_inc(&CmdUrbs);
dbg("%s - ALLOCATE URB %p (outstanding %d)", dev_dbg(dev, "%s - ALLOCATE URB %p (outstanding %d)\n",
__func__, urb, atomic_read(&CmdUrbs)); __func__, urb, atomic_read(&CmdUrbs));
usb_fill_bulk_urb(urb, edge_serial->serial->dev, usb_fill_bulk_urb(urb, edge_serial->serial->dev,
...@@ -2364,8 +2326,7 @@ static int write_cmd_usb(struct edgeport_port *edge_port, ...@@ -2364,8 +2326,7 @@ static int write_cmd_usb(struct edgeport_port *edge_port,
if (status) { if (status) {
/* something went wrong */ /* something went wrong */
dev_err(&edge_port->port->dev, dev_err(dev, "%s - usb_submit_urb(write command) failed, status = %d\n",
"%s - usb_submit_urb(write command) failed, status = %d\n",
__func__, status); __func__, status);
usb_kill_urb(urb); usb_kill_urb(urb);
usb_free_urb(urb); usb_free_urb(urb);
...@@ -2378,7 +2339,7 @@ static int write_cmd_usb(struct edgeport_port *edge_port, ...@@ -2378,7 +2339,7 @@ static int write_cmd_usb(struct edgeport_port *edge_port,
if (edge_port->commandPending) { if (edge_port->commandPending) {
/* command timed out */ /* command timed out */
dbg("%s - command timed out", __func__); dev_dbg(dev, "%s - command timed out\n", __func__);
status = -EINVAL; status = -EINVAL;
} }
#endif #endif
...@@ -2396,6 +2357,7 @@ static int send_cmd_write_baud_rate(struct edgeport_port *edge_port, ...@@ -2396,6 +2357,7 @@ static int send_cmd_write_baud_rate(struct edgeport_port *edge_port,
{ {
struct edgeport_serial *edge_serial = struct edgeport_serial *edge_serial =
usb_get_serial_data(edge_port->port->serial); usb_get_serial_data(edge_port->port->serial);
struct device *dev = &edge_port->port->dev;
unsigned char *cmdBuffer; unsigned char *cmdBuffer;
unsigned char *currCmd; unsigned char *currCmd;
int cmdLen = 0; int cmdLen = 0;
...@@ -2406,26 +2368,24 @@ static int send_cmd_write_baud_rate(struct edgeport_port *edge_port, ...@@ -2406,26 +2368,24 @@ static int send_cmd_write_baud_rate(struct edgeport_port *edge_port,
if (edge_serial->is_epic && if (edge_serial->is_epic &&
!edge_serial->epic_descriptor.Supports.IOSPSetBaudRate) { !edge_serial->epic_descriptor.Supports.IOSPSetBaudRate) {
dbg("SendCmdWriteBaudRate - NOT Setting baud rate for port = %d, baud = %d", dev_dbg(dev, "SendCmdWriteBaudRate - NOT Setting baud rate for port = %d, baud = %d\n",
edge_port->port->number, baudRate); edge_port->port->number, baudRate);
return 0; return 0;
} }
dbg("%s - port = %d, baud = %d", __func__, dev_dbg(dev, "%s - port = %d, baud = %d\n", __func__,
edge_port->port->number, baudRate); edge_port->port->number, baudRate);
status = calc_baud_rate_divisor(baudRate, &divisor); status = calc_baud_rate_divisor(dev, baudRate, &divisor);
if (status) { if (status) {
dev_err(&edge_port->port->dev, "%s - bad baud rate\n", dev_err(dev, "%s - bad baud rate\n", __func__);
__func__);
return status; return status;
} }
/* Alloc memory for the string of commands. */ /* Alloc memory for the string of commands. */
cmdBuffer = kmalloc(0x100, GFP_ATOMIC); cmdBuffer = kmalloc(0x100, GFP_ATOMIC);
if (!cmdBuffer) { if (!cmdBuffer) {
dev_err(&edge_port->port->dev, dev_err(dev, "%s - kmalloc(%d) failed.\n", __func__, 0x100);
"%s - kmalloc(%d) failed.\n", __func__, 0x100);
return -ENOMEM; return -ENOMEM;
} }
currCmd = cmdBuffer; currCmd = cmdBuffer;
...@@ -2456,14 +2416,11 @@ static int send_cmd_write_baud_rate(struct edgeport_port *edge_port, ...@@ -2456,14 +2416,11 @@ static int send_cmd_write_baud_rate(struct edgeport_port *edge_port,
* this function calculates the proper baud rate divisor for the specified * this function calculates the proper baud rate divisor for the specified
* baud rate. * baud rate.
*****************************************************************************/ *****************************************************************************/
static int calc_baud_rate_divisor(int baudrate, int *divisor) static int calc_baud_rate_divisor(struct device *dev, int baudrate, int *divisor)
{ {
int i; int i;
__u16 custom; __u16 custom;
dbg("%s - %d", __func__, baudrate);
for (i = 0; i < ARRAY_SIZE(divisor_table); i++) { for (i = 0; i < ARRAY_SIZE(divisor_table); i++) {
if (divisor_table[i].BaudRate == baudrate) { if (divisor_table[i].BaudRate == baudrate) {
*divisor = divisor_table[i].Divisor; *divisor = divisor_table[i].Divisor;
...@@ -2480,7 +2437,7 @@ static int calc_baud_rate_divisor(int baudrate, int *divisor) ...@@ -2480,7 +2437,7 @@ static int calc_baud_rate_divisor(int baudrate, int *divisor)
*divisor = custom; *divisor = custom;
dbg("%s - Baud %d = %d", __func__, baudrate, custom); dev_dbg(dev, "%s - Baud %d = %d\n", __func__, baudrate, custom);
return 0; return 0;
} }
...@@ -2497,25 +2454,26 @@ static int send_cmd_write_uart_register(struct edgeport_port *edge_port, ...@@ -2497,25 +2454,26 @@ static int send_cmd_write_uart_register(struct edgeport_port *edge_port,
{ {
struct edgeport_serial *edge_serial = struct edgeport_serial *edge_serial =
usb_get_serial_data(edge_port->port->serial); usb_get_serial_data(edge_port->port->serial);
struct device *dev = &edge_port->port->dev;
unsigned char *cmdBuffer; unsigned char *cmdBuffer;
unsigned char *currCmd; unsigned char *currCmd;
unsigned long cmdLen = 0; unsigned long cmdLen = 0;
int status; int status;
dbg("%s - write to %s register 0x%02x", dev_dbg(dev, "%s - write to %s register 0x%02x\n",
(regNum == MCR) ? "MCR" : "LCR", __func__, regValue); (regNum == MCR) ? "MCR" : "LCR", __func__, regValue);
if (edge_serial->is_epic && if (edge_serial->is_epic &&
!edge_serial->epic_descriptor.Supports.IOSPWriteMCR && !edge_serial->epic_descriptor.Supports.IOSPWriteMCR &&
regNum == MCR) { regNum == MCR) {
dbg("SendCmdWriteUartReg - Not writing to MCR Register"); dev_dbg(dev, "SendCmdWriteUartReg - Not writing to MCR Register\n");
return 0; return 0;
} }
if (edge_serial->is_epic && if (edge_serial->is_epic &&
!edge_serial->epic_descriptor.Supports.IOSPWriteLCR && !edge_serial->epic_descriptor.Supports.IOSPWriteLCR &&
regNum == LCR) { regNum == LCR) {
dbg("SendCmdWriteUartReg - Not writing to LCR Register"); dev_dbg(dev, "SendCmdWriteUartReg - Not writing to LCR Register\n");
return 0; return 0;
} }
...@@ -2550,6 +2508,7 @@ static int send_cmd_write_uart_register(struct edgeport_port *edge_port, ...@@ -2550,6 +2508,7 @@ static int send_cmd_write_uart_register(struct edgeport_port *edge_port,
static void change_port_settings(struct tty_struct *tty, static void change_port_settings(struct tty_struct *tty,
struct edgeport_port *edge_port, struct ktermios *old_termios) struct edgeport_port *edge_port, struct ktermios *old_termios)
{ {
struct device *dev = &edge_port->port->dev;
struct edgeport_serial *edge_serial = struct edgeport_serial *edge_serial =
usb_get_serial_data(edge_port->port->serial); usb_get_serial_data(edge_port->port->serial);
int baud; int baud;
...@@ -2562,11 +2521,11 @@ static void change_port_settings(struct tty_struct *tty, ...@@ -2562,11 +2521,11 @@ static void change_port_settings(struct tty_struct *tty,
__u8 txFlow; __u8 txFlow;
int status; int status;
dbg("%s - port %d", __func__, edge_port->port->number); dev_dbg(dev, "%s - port %d\n", __func__, edge_port->port->number);
if (!edge_port->open && if (!edge_port->open &&
!edge_port->openPending) { !edge_port->openPending) {
dbg("%s - port not opened", __func__); dev_dbg(dev, "%s - port not opened\n", __func__);
return; return;
} }
...@@ -2575,20 +2534,20 @@ static void change_port_settings(struct tty_struct *tty, ...@@ -2575,20 +2534,20 @@ static void change_port_settings(struct tty_struct *tty,
switch (cflag & CSIZE) { switch (cflag & CSIZE) {
case CS5: case CS5:
lData = LCR_BITS_5; mask = 0x1f; lData = LCR_BITS_5; mask = 0x1f;
dbg("%s - data bits = 5", __func__); dev_dbg(dev, "%s - data bits = 5\n", __func__);
break; break;
case CS6: case CS6:
lData = LCR_BITS_6; mask = 0x3f; lData = LCR_BITS_6; mask = 0x3f;
dbg("%s - data bits = 6", __func__); dev_dbg(dev, "%s - data bits = 6\n", __func__);
break; break;
case CS7: case CS7:
lData = LCR_BITS_7; mask = 0x7f; lData = LCR_BITS_7; mask = 0x7f;
dbg("%s - data bits = 7", __func__); dev_dbg(dev, "%s - data bits = 7\n", __func__);
break; break;
default: default:
case CS8: case CS8:
lData = LCR_BITS_8; lData = LCR_BITS_8;
dbg("%s - data bits = 8", __func__); dev_dbg(dev, "%s - data bits = 8\n", __func__);
break; break;
} }
...@@ -2597,28 +2556,28 @@ static void change_port_settings(struct tty_struct *tty, ...@@ -2597,28 +2556,28 @@ static void change_port_settings(struct tty_struct *tty,
if (cflag & CMSPAR) { if (cflag & CMSPAR) {
if (cflag & PARODD) { if (cflag & PARODD) {
lParity = LCR_PAR_MARK; lParity = LCR_PAR_MARK;
dbg("%s - parity = mark", __func__); dev_dbg(dev, "%s - parity = mark\n", __func__);
} else { } else {
lParity = LCR_PAR_SPACE; lParity = LCR_PAR_SPACE;
dbg("%s - parity = space", __func__); dev_dbg(dev, "%s - parity = space\n", __func__);
} }
} else if (cflag & PARODD) { } else if (cflag & PARODD) {
lParity = LCR_PAR_ODD; lParity = LCR_PAR_ODD;
dbg("%s - parity = odd", __func__); dev_dbg(dev, "%s - parity = odd\n", __func__);
} else { } else {
lParity = LCR_PAR_EVEN; lParity = LCR_PAR_EVEN;
dbg("%s - parity = even", __func__); dev_dbg(dev, "%s - parity = even\n", __func__);
} }
} else { } else {
dbg("%s - parity = none", __func__); dev_dbg(dev, "%s - parity = none\n", __func__);
} }
if (cflag & CSTOPB) { if (cflag & CSTOPB) {
lStop = LCR_STOP_2; lStop = LCR_STOP_2;
dbg("%s - stop bits = 2", __func__); dev_dbg(dev, "%s - stop bits = 2\n", __func__);
} else { } else {
lStop = LCR_STOP_1; lStop = LCR_STOP_1;
dbg("%s - stop bits = 1", __func__); dev_dbg(dev, "%s - stop bits = 1\n", __func__);
} }
/* figure out the flow control settings */ /* figure out the flow control settings */
...@@ -2626,9 +2585,9 @@ static void change_port_settings(struct tty_struct *tty, ...@@ -2626,9 +2585,9 @@ static void change_port_settings(struct tty_struct *tty,
if (cflag & CRTSCTS) { if (cflag & CRTSCTS) {
rxFlow |= IOSP_RX_FLOW_RTS; rxFlow |= IOSP_RX_FLOW_RTS;
txFlow |= IOSP_TX_FLOW_CTS; txFlow |= IOSP_TX_FLOW_CTS;
dbg("%s - RTS/CTS is enabled", __func__); dev_dbg(dev, "%s - RTS/CTS is enabled\n", __func__);
} else { } else {
dbg("%s - RTS/CTS is disabled", __func__); dev_dbg(dev, "%s - RTS/CTS is disabled\n", __func__);
} }
/* if we are implementing XON/XOFF, set the start and stop character /* if we are implementing XON/XOFF, set the start and stop character
...@@ -2649,19 +2608,19 @@ static void change_port_settings(struct tty_struct *tty, ...@@ -2649,19 +2608,19 @@ static void change_port_settings(struct tty_struct *tty,
/* if we are implementing INBOUND XON/XOFF */ /* if we are implementing INBOUND XON/XOFF */
if (I_IXOFF(tty)) { if (I_IXOFF(tty)) {
rxFlow |= IOSP_RX_FLOW_XON_XOFF; rxFlow |= IOSP_RX_FLOW_XON_XOFF;
dbg("%s - INBOUND XON/XOFF is enabled, XON = %2x, XOFF = %2x", dev_dbg(dev, "%s - INBOUND XON/XOFF is enabled, XON = %2x, XOFF = %2x\n",
__func__, start_char, stop_char); __func__, start_char, stop_char);
} else { } else {
dbg("%s - INBOUND XON/XOFF is disabled", __func__); dev_dbg(dev, "%s - INBOUND XON/XOFF is disabled\n", __func__);
} }
/* if we are implementing OUTBOUND XON/XOFF */ /* if we are implementing OUTBOUND XON/XOFF */
if (I_IXON(tty)) { if (I_IXON(tty)) {
txFlow |= IOSP_TX_FLOW_XON_XOFF; txFlow |= IOSP_TX_FLOW_XON_XOFF;
dbg("%s - OUTBOUND XON/XOFF is enabled, XON = %2x, XOFF = %2x", dev_dbg(dev, "%s - OUTBOUND XON/XOFF is enabled, XON = %2x, XOFF = %2x\n",
__func__, start_char, stop_char); __func__, start_char, stop_char);
} else { } else {
dbg("%s - OUTBOUND XON/XOFF is disabled", __func__); dev_dbg(dev, "%s - OUTBOUND XON/XOFF is disabled\n", __func__);
} }
} }
...@@ -2704,7 +2663,7 @@ static void change_port_settings(struct tty_struct *tty, ...@@ -2704,7 +2663,7 @@ static void change_port_settings(struct tty_struct *tty,
baud = 9600; baud = 9600;
} }
dbg("%s - baud rate = %d", __func__, baud); dev_dbg(dev, "%s - baud rate = %d\n", __func__, baud);
status = send_cmd_write_baud_rate(edge_port, baud); status = send_cmd_write_baud_rate(edge_port, baud);
if (status == -1) { if (status == -1) {
/* Speed change was not possible - put back the old speed */ /* Speed change was not possible - put back the old speed */
...@@ -2746,9 +2705,10 @@ static void unicode_to_ascii(char *string, int buflen, ...@@ -2746,9 +2705,10 @@ static void unicode_to_ascii(char *string, int buflen,
****************************************************************************/ ****************************************************************************/
static void get_manufacturing_desc(struct edgeport_serial *edge_serial) static void get_manufacturing_desc(struct edgeport_serial *edge_serial)
{ {
struct device *dev = &edge_serial->serial->dev->dev;
int response; int response;
dbg("getting manufacturer descriptor"); dev_dbg(dev, "getting manufacturer descriptor\n");
response = rom_read(edge_serial->serial, response = rom_read(edge_serial->serial,
(EDGE_MANUF_DESC_ADDR & 0xffff0000) >> 16, (EDGE_MANUF_DESC_ADDR & 0xffff0000) >> 16,
...@@ -2757,42 +2717,41 @@ static void get_manufacturing_desc(struct edgeport_serial *edge_serial) ...@@ -2757,42 +2717,41 @@ static void get_manufacturing_desc(struct edgeport_serial *edge_serial)
(__u8 *)(&edge_serial->manuf_descriptor)); (__u8 *)(&edge_serial->manuf_descriptor));
if (response < 1) if (response < 1)
dev_err(&edge_serial->serial->dev->dev, dev_err(dev, "error in getting manufacturer descriptor\n");
"error in getting manufacturer descriptor\n");
else { else {
char string[30]; char string[30];
dbg("**Manufacturer Descriptor"); dev_dbg(dev, "**Manufacturer Descriptor\n");
dbg(" RomSize: %dK", dev_dbg(dev, " RomSize: %dK\n",
edge_serial->manuf_descriptor.RomSize); edge_serial->manuf_descriptor.RomSize);
dbg(" RamSize: %dK", dev_dbg(dev, " RamSize: %dK\n",
edge_serial->manuf_descriptor.RamSize); edge_serial->manuf_descriptor.RamSize);
dbg(" CpuRev: %d", dev_dbg(dev, " CpuRev: %d\n",
edge_serial->manuf_descriptor.CpuRev); edge_serial->manuf_descriptor.CpuRev);
dbg(" BoardRev: %d", dev_dbg(dev, " BoardRev: %d\n",
edge_serial->manuf_descriptor.BoardRev); edge_serial->manuf_descriptor.BoardRev);
dbg(" NumPorts: %d", dev_dbg(dev, " NumPorts: %d\n",
edge_serial->manuf_descriptor.NumPorts); edge_serial->manuf_descriptor.NumPorts);
dbg(" DescDate: %d/%d/%d", dev_dbg(dev, " DescDate: %d/%d/%d\n",
edge_serial->manuf_descriptor.DescDate[0], edge_serial->manuf_descriptor.DescDate[0],
edge_serial->manuf_descriptor.DescDate[1], edge_serial->manuf_descriptor.DescDate[1],
edge_serial->manuf_descriptor.DescDate[2]+1900); edge_serial->manuf_descriptor.DescDate[2]+1900);
unicode_to_ascii(string, sizeof(string), unicode_to_ascii(string, sizeof(string),
edge_serial->manuf_descriptor.SerialNumber, edge_serial->manuf_descriptor.SerialNumber,
edge_serial->manuf_descriptor.SerNumLength/2); edge_serial->manuf_descriptor.SerNumLength/2);
dbg(" SerialNumber: %s", string); dev_dbg(dev, " SerialNumber: %s\n", string);
unicode_to_ascii(string, sizeof(string), unicode_to_ascii(string, sizeof(string),
edge_serial->manuf_descriptor.AssemblyNumber, edge_serial->manuf_descriptor.AssemblyNumber,
edge_serial->manuf_descriptor.AssemblyNumLength/2); edge_serial->manuf_descriptor.AssemblyNumLength/2);
dbg(" AssemblyNumber: %s", string); dev_dbg(dev, " AssemblyNumber: %s\n", string);
unicode_to_ascii(string, sizeof(string), unicode_to_ascii(string, sizeof(string),
edge_serial->manuf_descriptor.OemAssyNumber, edge_serial->manuf_descriptor.OemAssyNumber,
edge_serial->manuf_descriptor.OemAssyNumLength/2); edge_serial->manuf_descriptor.OemAssyNumLength/2);
dbg(" OemAssyNumber: %s", string); dev_dbg(dev, " OemAssyNumber: %s\n", string);
dbg(" UartType: %d", dev_dbg(dev, " UartType: %d\n",
edge_serial->manuf_descriptor.UartType); edge_serial->manuf_descriptor.UartType);
dbg(" IonPid: %d", dev_dbg(dev, " IonPid: %d\n",
edge_serial->manuf_descriptor.IonPid); edge_serial->manuf_descriptor.IonPid);
dbg(" IonConfig: %d", dev_dbg(dev, " IonConfig: %d\n",
edge_serial->manuf_descriptor.IonConfig); edge_serial->manuf_descriptor.IonConfig);
} }
} }
...@@ -2805,9 +2764,10 @@ static void get_manufacturing_desc(struct edgeport_serial *edge_serial) ...@@ -2805,9 +2764,10 @@ static void get_manufacturing_desc(struct edgeport_serial *edge_serial)
****************************************************************************/ ****************************************************************************/
static void get_boot_desc(struct edgeport_serial *edge_serial) static void get_boot_desc(struct edgeport_serial *edge_serial)
{ {
struct device *dev = &edge_serial->serial->dev->dev;
int response; int response;
dbg("getting boot descriptor"); dev_dbg(dev, "getting boot descriptor\n");
response = rom_read(edge_serial->serial, response = rom_read(edge_serial->serial,
(EDGE_BOOT_DESC_ADDR & 0xffff0000) >> 16, (EDGE_BOOT_DESC_ADDR & 0xffff0000) >> 16,
...@@ -2816,23 +2776,22 @@ static void get_boot_desc(struct edgeport_serial *edge_serial) ...@@ -2816,23 +2776,22 @@ static void get_boot_desc(struct edgeport_serial *edge_serial)
(__u8 *)(&edge_serial->boot_descriptor)); (__u8 *)(&edge_serial->boot_descriptor));
if (response < 1) if (response < 1)
dev_err(&edge_serial->serial->dev->dev, dev_err(dev, "error in getting boot descriptor\n");
"error in getting boot descriptor\n");
else { else {
dbg("**Boot Descriptor:"); dev_dbg(dev, "**Boot Descriptor:\n");
dbg(" BootCodeLength: %d", dev_dbg(dev, " BootCodeLength: %d\n",
le16_to_cpu(edge_serial->boot_descriptor.BootCodeLength)); le16_to_cpu(edge_serial->boot_descriptor.BootCodeLength));
dbg(" MajorVersion: %d", dev_dbg(dev, " MajorVersion: %d\n",
edge_serial->boot_descriptor.MajorVersion); edge_serial->boot_descriptor.MajorVersion);
dbg(" MinorVersion: %d", dev_dbg(dev, " MinorVersion: %d\n",
edge_serial->boot_descriptor.MinorVersion); edge_serial->boot_descriptor.MinorVersion);
dbg(" BuildNumber: %d", dev_dbg(dev, " BuildNumber: %d\n",
le16_to_cpu(edge_serial->boot_descriptor.BuildNumber)); le16_to_cpu(edge_serial->boot_descriptor.BuildNumber));
dbg(" Capabilities: 0x%x", dev_dbg(dev, " Capabilities: 0x%x\n",
le16_to_cpu(edge_serial->boot_descriptor.Capabilities)); le16_to_cpu(edge_serial->boot_descriptor.Capabilities));
dbg(" UConfig0: %d", dev_dbg(dev, " UConfig0: %d\n",
edge_serial->boot_descriptor.UConfig0); edge_serial->boot_descriptor.UConfig0);
dbg(" UConfig1: %d", dev_dbg(dev, " UConfig1: %d\n",
edge_serial->boot_descriptor.UConfig1); edge_serial->boot_descriptor.UConfig1);
} }
} }
...@@ -2844,6 +2803,7 @@ static void get_boot_desc(struct edgeport_serial *edge_serial) ...@@ -2844,6 +2803,7 @@ static void get_boot_desc(struct edgeport_serial *edge_serial)
****************************************************************************/ ****************************************************************************/
static void load_application_firmware(struct edgeport_serial *edge_serial) static void load_application_firmware(struct edgeport_serial *edge_serial)
{ {
struct device *dev = &edge_serial->serial->dev->dev;
const struct ihex_binrec *rec; const struct ihex_binrec *rec;
const struct firmware *fw; const struct firmware *fw;
const char *fw_name; const char *fw_name;
...@@ -2864,7 +2824,7 @@ static void load_application_firmware(struct edgeport_serial *edge_serial) ...@@ -2864,7 +2824,7 @@ static void load_application_firmware(struct edgeport_serial *edge_serial)
break; break;
case EDGE_DOWNLOAD_FILE_NONE: case EDGE_DOWNLOAD_FILE_NONE:
dbg("No download file specified, skipping download"); dev_dbg(dev, "No download file specified, skipping download\n");
return; return;
default: default:
...@@ -2874,7 +2834,7 @@ static void load_application_firmware(struct edgeport_serial *edge_serial) ...@@ -2874,7 +2834,7 @@ static void load_application_firmware(struct edgeport_serial *edge_serial)
response = request_ihex_firmware(&fw, fw_name, response = request_ihex_firmware(&fw, fw_name,
&edge_serial->serial->dev->dev); &edge_serial->serial->dev->dev);
if (response) { if (response) {
printk(KERN_ERR "Failed to load image \"%s\" err %d\n", dev_err(dev, "Failed to load image \"%s\" err %d\n",
fw_name, response); fw_name, response);
return; return;
} }
...@@ -2882,7 +2842,7 @@ static void load_application_firmware(struct edgeport_serial *edge_serial) ...@@ -2882,7 +2842,7 @@ static void load_application_firmware(struct edgeport_serial *edge_serial)
rec = (const struct ihex_binrec *)fw->data; rec = (const struct ihex_binrec *)fw->data;
build = (rec->data[2] << 8) | rec->data[3]; build = (rec->data[2] << 8) | rec->data[3];
dbg("%s %d.%d.%d", fw_info, rec->data[0], rec->data[1], build); dev_dbg(dev, "%s %d.%d.%d\n", fw_info, rec->data[0], rec->data[1], build);
edge_serial->product_info.FirmwareMajorVersion = rec->data[0]; edge_serial->product_info.FirmwareMajorVersion = rec->data[0];
edge_serial->product_info.FirmwareMinorVersion = rec->data[1]; edge_serial->product_info.FirmwareMinorVersion = rec->data[1];
...@@ -2905,7 +2865,7 @@ static void load_application_firmware(struct edgeport_serial *edge_serial) ...@@ -2905,7 +2865,7 @@ static void load_application_firmware(struct edgeport_serial *edge_serial)
} }
} }
dbg("sending exec_dl_code"); dev_dbg(dev, "sending exec_dl_code\n");
response = usb_control_msg (edge_serial->serial->dev, response = usb_control_msg (edge_serial->serial->dev,
usb_sndctrlpipe(edge_serial->serial->dev, 0), usb_sndctrlpipe(edge_serial->serial->dev, 0),
USB_REQUEST_ION_EXEC_DL_CODE, USB_REQUEST_ION_EXEC_DL_CODE,
...@@ -2923,6 +2883,7 @@ static int edge_startup(struct usb_serial *serial) ...@@ -2923,6 +2883,7 @@ static int edge_startup(struct usb_serial *serial)
struct edgeport_serial *edge_serial; struct edgeport_serial *edge_serial;
struct edgeport_port *edge_port; struct edgeport_port *edge_port;
struct usb_device *dev; struct usb_device *dev;
struct device *ddev = &serial->dev->dev;
int i, j; int i, j;
int response; int response;
bool interrupt_in_found; bool interrupt_in_found;
...@@ -2974,32 +2935,31 @@ static int edge_startup(struct usb_serial *serial) ...@@ -2974,32 +2935,31 @@ static int edge_startup(struct usb_serial *serial)
/* serial->num_ports = serial->product_info.NumPorts; */ /* serial->num_ports = serial->product_info.NumPorts; */
if ((!edge_serial->is_epic) && if ((!edge_serial->is_epic) &&
(edge_serial->product_info.NumPorts != serial->num_ports)) { (edge_serial->product_info.NumPorts != serial->num_ports)) {
dev_warn(&serial->dev->dev, "Device Reported %d serial ports " dev_warn(ddev,
"vs. core thinking we have %d ports, email " "Device Reported %d serial ports vs. core thinking we have %d ports, email greg@kroah.com this information.\n",
"greg@kroah.com this information.\n",
edge_serial->product_info.NumPorts, edge_serial->product_info.NumPorts,
serial->num_ports); serial->num_ports);
} }
dbg("%s - time 1 %ld", __func__, jiffies); dev_dbg(ddev, "%s - time 1 %ld\n", __func__, jiffies);
/* If not an EPiC device */ /* If not an EPiC device */
if (!edge_serial->is_epic) { if (!edge_serial->is_epic) {
/* now load the application firmware into this device */ /* now load the application firmware into this device */
load_application_firmware(edge_serial); load_application_firmware(edge_serial);
dbg("%s - time 2 %ld", __func__, jiffies); dev_dbg(ddev, "%s - time 2 %ld\n", __func__, jiffies);
/* Check current Edgeport EEPROM and update if necessary */ /* Check current Edgeport EEPROM and update if necessary */
update_edgeport_E2PROM(edge_serial); update_edgeport_E2PROM(edge_serial);
dbg("%s - time 3 %ld", __func__, jiffies); dev_dbg(ddev, "%s - time 3 %ld\n", __func__, jiffies);
/* set the configuration to use #1 */ /* set the configuration to use #1 */
/* dbg("set_configuration 1"); */ /* dev_dbg(ddev, "set_configuration 1\n"); */
/* usb_set_configuration (dev, 1); */ /* usb_set_configuration (dev, 1); */
} }
dbg(" FirmwareMajorVersion %d.%d.%d", dev_dbg(ddev, " FirmwareMajorVersion %d.%d.%d\n",
edge_serial->product_info.FirmwareMajorVersion, edge_serial->product_info.FirmwareMajorVersion,
edge_serial->product_info.FirmwareMinorVersion, edge_serial->product_info.FirmwareMinorVersion,
le16_to_cpu(edge_serial->product_info.FirmwareBuildNumber)); le16_to_cpu(edge_serial->product_info.FirmwareBuildNumber));
...@@ -3011,8 +2971,7 @@ static int edge_startup(struct usb_serial *serial) ...@@ -3011,8 +2971,7 @@ static int edge_startup(struct usb_serial *serial)
for (i = 0; i < serial->num_ports; ++i) { for (i = 0; i < serial->num_ports; ++i) {
edge_port = kzalloc(sizeof(struct edgeport_port), GFP_KERNEL); edge_port = kzalloc(sizeof(struct edgeport_port), GFP_KERNEL);
if (edge_port == NULL) { if (edge_port == NULL) {
dev_err(&serial->dev->dev, "%s - Out of memory\n", dev_err(ddev, "%s - Out of memory\n", __func__);
__func__);
for (j = 0; j < i; ++j) { for (j = 0; j < i; ++j) {
kfree(usb_get_serial_port_data(serial->port[j])); kfree(usb_get_serial_port_data(serial->port[j]));
usb_set_serial_port_data(serial->port[j], usb_set_serial_port_data(serial->port[j],
...@@ -3044,19 +3003,19 @@ static int edge_startup(struct usb_serial *serial) ...@@ -3044,19 +3003,19 @@ static int edge_startup(struct usb_serial *serial)
if (!interrupt_in_found && if (!interrupt_in_found &&
(usb_endpoint_is_int_in(endpoint))) { (usb_endpoint_is_int_in(endpoint))) {
/* we found a interrupt in endpoint */ /* we found a interrupt in endpoint */
dbg("found interrupt in"); dev_dbg(ddev, "found interrupt in\n");
/* not set up yet, so do it now */ /* not set up yet, so do it now */
edge_serial->interrupt_read_urb = edge_serial->interrupt_read_urb =
usb_alloc_urb(0, GFP_KERNEL); usb_alloc_urb(0, GFP_KERNEL);
if (!edge_serial->interrupt_read_urb) { if (!edge_serial->interrupt_read_urb) {
dev_err(&dev->dev, "out of memory\n"); dev_err(ddev, "out of memory\n");
return -ENOMEM; return -ENOMEM;
} }
edge_serial->interrupt_in_buffer = edge_serial->interrupt_in_buffer =
kmalloc(buffer_size, GFP_KERNEL); kmalloc(buffer_size, GFP_KERNEL);
if (!edge_serial->interrupt_in_buffer) { if (!edge_serial->interrupt_in_buffer) {
dev_err(&dev->dev, "out of memory\n"); dev_err(ddev, "out of memory\n");
usb_free_urb(edge_serial->interrupt_read_urb); usb_free_urb(edge_serial->interrupt_read_urb);
return -ENOMEM; return -ENOMEM;
} }
...@@ -3081,13 +3040,13 @@ static int edge_startup(struct usb_serial *serial) ...@@ -3081,13 +3040,13 @@ static int edge_startup(struct usb_serial *serial)
if (!bulk_in_found && if (!bulk_in_found &&
(usb_endpoint_is_bulk_in(endpoint))) { (usb_endpoint_is_bulk_in(endpoint))) {
/* we found a bulk in endpoint */ /* we found a bulk in endpoint */
dbg("found bulk in"); dev_dbg(ddev, "found bulk in\n");
/* not set up yet, so do it now */ /* not set up yet, so do it now */
edge_serial->read_urb = edge_serial->read_urb =
usb_alloc_urb(0, GFP_KERNEL); usb_alloc_urb(0, GFP_KERNEL);
if (!edge_serial->read_urb) { if (!edge_serial->read_urb) {
dev_err(&dev->dev, "out of memory\n"); dev_err(ddev, "out of memory\n");
return -ENOMEM; return -ENOMEM;
} }
edge_serial->bulk_in_buffer = edge_serial->bulk_in_buffer =
...@@ -3114,7 +3073,7 @@ static int edge_startup(struct usb_serial *serial) ...@@ -3114,7 +3073,7 @@ static int edge_startup(struct usb_serial *serial)
if (!bulk_out_found && if (!bulk_out_found &&
(usb_endpoint_is_bulk_out(endpoint))) { (usb_endpoint_is_bulk_out(endpoint))) {
/* we found a bulk out endpoint */ /* we found a bulk out endpoint */
dbg("found bulk out"); dev_dbg(ddev, "found bulk out\n");
edge_serial->bulk_out_endpoint = edge_serial->bulk_out_endpoint =
endpoint->bEndpointAddress; endpoint->bEndpointAddress;
bulk_out_found = true; bulk_out_found = true;
...@@ -3122,8 +3081,7 @@ static int edge_startup(struct usb_serial *serial) ...@@ -3122,8 +3081,7 @@ static int edge_startup(struct usb_serial *serial)
} }
if (!interrupt_in_found || !bulk_in_found || !bulk_out_found) { if (!interrupt_in_found || !bulk_in_found || !bulk_out_found) {
dev_err(&dev->dev, "Error - the proper endpoints " dev_err(ddev, "Error - the proper endpoints were not found!\n");
"were not found!\n");
return -ENODEV; return -ENODEV;
} }
...@@ -3132,8 +3090,7 @@ static int edge_startup(struct usb_serial *serial) ...@@ -3132,8 +3090,7 @@ static int edge_startup(struct usb_serial *serial)
response = usb_submit_urb(edge_serial->interrupt_read_urb, response = usb_submit_urb(edge_serial->interrupt_read_urb,
GFP_KERNEL); GFP_KERNEL);
if (response) if (response)
dev_err(&dev->dev, dev_err(ddev, "%s - Error %d submitting control urb\n",
"%s - Error %d submitting control urb\n",
__func__, response); __func__, response);
} }
return response; return response;
...@@ -3148,8 +3105,6 @@ static void edge_disconnect(struct usb_serial *serial) ...@@ -3148,8 +3105,6 @@ static void edge_disconnect(struct usb_serial *serial)
{ {
struct edgeport_serial *edge_serial = usb_get_serial_data(serial); struct edgeport_serial *edge_serial = usb_get_serial_data(serial);
dbg("%s", __func__);
/* stop reads and writes on all ports */ /* stop reads and writes on all ports */
/* free up our endpoint stuff */ /* free up our endpoint stuff */
if (edge_serial->is_epic) { if (edge_serial->is_epic) {
...@@ -3173,8 +3128,6 @@ static void edge_release(struct usb_serial *serial) ...@@ -3173,8 +3128,6 @@ static void edge_release(struct usb_serial *serial)
struct edgeport_serial *edge_serial = usb_get_serial_data(serial); struct edgeport_serial *edge_serial = usb_get_serial_data(serial);
int i; int i;
dbg("%s", __func__);
for (i = 0; i < serial->num_ports; ++i) for (i = 0; i < serial->num_ports; ++i)
kfree(usb_get_serial_port_data(serial->port[i])); kfree(usb_get_serial_port_data(serial->port[i]));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7