diff options
Diffstat (limited to 'drivers/dahdi')
-rw-r--r-- | drivers/dahdi/xpp/card_bri.c | 10 | ||||
-rw-r--r-- | drivers/dahdi/xpp/card_fxo.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/card_fxs.c | 4 | ||||
-rw-r--r-- | drivers/dahdi/xpp/card_pri.c | 14 | ||||
-rw-r--r-- | drivers/dahdi/xpp/mmapdrv.c | 16 | ||||
-rw-r--r-- | drivers/dahdi/xpp/print_fxo_modes.c | 10 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xbus-core.c | 6 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xbus-pcm.c | 12 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xbus-sysfs.c | 4 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xdefs.h | 8 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xframe_queue.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xpp_usb.c | 20 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xproto.c | 14 |
14 files changed, 62 insertions, 62 deletions
diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c index 5485a5e..8e4a16c 100644 --- a/drivers/dahdi/xpp/card_bri.c +++ b/drivers/dahdi/xpp/card_bri.c @@ -483,7 +483,7 @@ static int rx_dchan(xpd_t *xpd, reg_cmd_t *regcmd) goto out; if((ret = bri_check_stat(xpd, dchan, src, len)) < 0) goto out; - /* + /* * Tell Dahdi that we received len-1 bytes. They include the data and a 2-byte checksum. * The last byte (that we don't pass on) is 0 if the checksum is correct. If it were wrong, * we would drop the packet in the "if(src[len-1])" above. @@ -747,7 +747,7 @@ static int BRI_card_dahdi_preregistration(xpd_t *xpd, bool on) xbus_t *xbus; struct BRI_priv_data *priv; int i; - + BUG_ON(!xpd); xbus = xpd->xbus; priv = xpd->priv; @@ -787,7 +787,7 @@ static int BRI_card_dahdi_preregistration(xpd_t *xpd, bool on) static int BRI_card_dahdi_postregistration(xpd_t *xpd, bool on) { xbus_t *xbus; - + BUG_ON(!xpd); xbus = xpd->xbus; BUG_ON(!xbus); @@ -1502,7 +1502,7 @@ static int BRI_card_register_reply(xbus_t *xbus, xpd_t *xpd, reg_cmd_t *info) priv->dchan_rx_drops++; if(atomic_read(&PHONEDEV(xpd).open_counter) > 0) XPD_NOTICE(xpd, "Multibyte Drop: errno=%d\n", ret); - } + } goto end; } if(REG_FIELD(info, regnum) == A_SU_RD_STA) { @@ -1516,7 +1516,7 @@ static int BRI_card_register_reply(xbus_t *xbus, xpd_t *xpd, reg_cmd_t *info) REG_FIELD(&xpd->requested_reply, subreg) == REG_FIELD(info, subreg)) { xpd->last_reply = *info; } - + end: spin_unlock_irqrestore(&xpd->lock, flags); return 0; diff --git a/drivers/dahdi/xpp/card_fxo.c b/drivers/dahdi/xpp/card_fxo.c index 673e7d6..d21763c 100644 --- a/drivers/dahdi/xpp/card_fxo.c +++ b/drivers/dahdi/xpp/card_fxo.c @@ -706,7 +706,7 @@ static void handle_fxo_power_denial(xpd_t *xpd) * - The chan_dahdi.conf should have cidstart=polarity * - Based on an idea in http://bugs.digium.com/view.php?id=9096 */ -static void check_etsi_dtmf(xpd_t *xpd) +static void check_etsi_dtmf(xpd_t *xpd) { struct FXO_priv_data *priv; int portno; diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c index 2d0a5bb..0a96ee7 100644 --- a/drivers/dahdi/xpp/card_fxs.c +++ b/drivers/dahdi/xpp/card_fxs.c @@ -629,7 +629,7 @@ static int set_vm_led_mode(xbus_t *xbus, xpd_t *xpd, int pos, ret += SLIC_INDIRECT_REQUEST(xbus, xpd, pos, SLIC_WRITE, 0x16, 0x00, 0x00); ret += SLIC_INDIRECT_REQUEST(xbus, xpd, pos, SLIC_WRITE, 0x15, 0x77, 0x01); ret += SLIC_INDIRECT_REQUEST(xbus, xpd, pos, SLIC_WRITE, 0x14, 0xFD, 0x7E); - + ret += SLIC_DIRECT_REQUEST(xbus, xpd, pos, SLIC_WRITE, 0x22, 0x00); ret += SLIC_DIRECT_REQUEST(xbus, xpd, pos, SLIC_WRITE, 0x30, 0x00); ret += SLIC_DIRECT_REQUEST(xbus, xpd, pos, SLIC_WRITE, 0x31, 0x00); @@ -875,7 +875,7 @@ static int FXS_card_ioctl(xpd_t *xpd, int pos, unsigned int cmd, unsigned long a pos, __FUNCTION__, cmd); return -EINVAL; } - + switch (cmd) { case DAHDI_ONHOOKTRANSFER: if (get_user(val, (int __user *)arg)) diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c index 677bd6b..7607032 100644 --- a/drivers/dahdi/xpp/card_pri.c +++ b/drivers/dahdi/xpp/card_pri.c @@ -688,7 +688,7 @@ static void set_clocking(xpd_t *xpd) for(i = 0; i < MAX_SLAVES; i++) { struct PRI_priv_data *priv; xpd_t *subxpd; - + subxpd = xpd_byaddr(xbus, xpd->addr.unit, i); if(!subxpd) continue; @@ -1271,7 +1271,7 @@ static int apply_pri_protocol(xpd_t *xpd) xbus_t *xbus; struct PRI_priv_data *priv; int i; - + BUG_ON(!xpd); xbus = xpd->xbus; priv = xpd->priv; @@ -1328,7 +1328,7 @@ static int PRI_card_dahdi_preregistration(xpd_t *xpd, bool on) static int PRI_card_dahdi_postregistration(xpd_t *xpd, bool on) { xbus_t *xbus; - + BUG_ON(!xpd); xbus = xpd->xbus; BUG_ON(!xbus); @@ -1686,7 +1686,7 @@ static int pri_rbsbits(struct dahdi_chan *chan, int bits) } if (chan->sig == DAHDI_SIG_NONE) { LINE_DBG(SIGNAL, xpd, pos, - "RBS: TX: sigtyp=%s. , bits=0x%X. Ignore.\n", + "RBS: TX: sigtyp=%s. , bits=0x%X. Ignore.\n", sig2str(chan->sig), bits); return 0; } @@ -1710,7 +1710,7 @@ static int pri_rbsbits(struct dahdi_chan *chan, int bits) /*! Copy PCM chunks from the buffers of the xpd to a new packet * \param xbus xbus of source xpd. * \param xpd source xpd. - * \param lines a bitmask of the active channels that need to be copied. + * \param lines a bitmask of the active channels that need to be copied. * \param pack packet to be filled. * * On PRI this function is should also shift the lines mask one bit, as @@ -1787,7 +1787,7 @@ static void PRI_card_pcm_fromspan(xpd_t *xpd, xpacket_t *pack) * \param pack Source packet. * * On PRI this function is should also shift the lines back mask one bit, as - * channel 0 on the wire is an internal chip control channel. + * channel 0 on the wire is an internal chip control channel. * * \see PRI_card_pcm_fromspan */ @@ -2178,7 +2178,7 @@ static int PRI_card_register_reply(xbus_t *xbus, xpd_t *xpd, reg_cmd_t *info) REG_FIELD(&xpd->requested_reply, subreg) == REG_FIELD(info, subreg)) { xpd->last_reply = *info; } - + end: spin_unlock_irqrestore(&xpd->lock, flags); return 0; diff --git a/drivers/dahdi/xpp/mmapdrv.c b/drivers/dahdi/xpp/mmapdrv.c index 1ca3140..05c91ab 100644 --- a/drivers/dahdi/xpp/mmapdrv.c +++ b/drivers/dahdi/xpp/mmapdrv.c @@ -33,7 +33,7 @@ typedef char sizeof_xframe_t_should_be_divisible_by_4[((sizeof(xframe_t) % 4) == #ifdef DEBUG_VIA_GPIO /* - * For debugging we can use the following two pins. + * For debugging we can use the following two pins. * These two pins are not used *after initialization* */ #define DEBUG_GPIO1 CONF_DONE @@ -51,7 +51,7 @@ static int rx_intr_counter; #define START_RD_BURST 0x0008 #define AS_BF_MODE 0x0010 //stand alone Astribank without USB (Asterisk BlackFin Mode) #define EC_BF_MODE 0x0020 //all data between Astribank and USB routed thru BF(EchoCanceler BlackFin Mode) -#define NO_BF_MODE 0x0040 //Astribank worke with USB only (no BlackFin Mode) +#define NO_BF_MODE 0x0040 //Astribank worke with USB only (no BlackFin Mode) #define SET_XA_DIR 0x0080 #define GET_XPD_STS 0x0100 #define GET_CHECKSUM 0x0200 @@ -159,7 +159,7 @@ static irqreturn_t xpp_mmap_rx_irq(int irq, void *dev_id) buf[count+1] = v >> 8; } #endif - if (rxcnt & 1) + if (rxcnt & 1) buf[rxcnt-1] = inw(FPGA_BASE_ADDR); /* Sanity check: length of first packet in frame should be no more than the frame length */ if (((buf[0] | (buf[1]<<8)) & 0x3FF) > rxcnt) { @@ -466,7 +466,7 @@ static int __init xpp_mmap_load_fpga(u8 *data, size_t size) static void __exit xpp_mmap_unload_fpga(void) { bfin_write_PORTGIO_CLEAR(NCONFIG); //reset fpga during configuration holds nCONFIG low - udelay(40); //Tcfg ~40us delay + udelay(40); //Tcfg ~40us delay bfin_write_PORTGIO_DIR(bfin_read_PORTGIO_DIR() & ~( DATA | NCONFIG | DCLK)); //disable output pin bfin_write_PORTGIO_INEN(bfin_read_PORTGIO_INEN() & ~( CONF_DONE | NSTATUS));//disable input buffer INFO("FPGA Firmware unloaded\n"); @@ -498,7 +498,7 @@ static int __init xpp_mmap_init(void) ERR("xpp_mmap_load_firmware() failed, errno=%d\n", ret); goto fail_fw; } - + if ((ret = request_irq(FPGA_RX_IRQ, xpp_mmap_rx_irq, IRQF_TRIGGER_RISING, "xpp_mmap_rx", NULL)) < 0) { ERR("Unable to attach to RX interrupt %d\n", FPGA_RX_IRQ); goto fail_irq_rx; @@ -511,13 +511,13 @@ static int __init xpp_mmap_init(void) ERR("Unable to request memory region at %p\n", FPGA_BASE_ADDR); goto fail_region; } - outw(AS_BF_MODE, FPGA_BASE_ADDR + 4); + outw(AS_BF_MODE, FPGA_BASE_ADDR + 4); xframe_cache = kmem_cache_create("xframe_cache", sizeof(xframe_t) + XFRAME_DATASIZE, 0, 0, #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) - NULL, + NULL, #endif NULL); if(!xframe_cache) { @@ -532,7 +532,7 @@ static int __init xpp_mmap_init(void) } strncpy(global_xbus->connector, "mmap", XBUS_DESCLEN); strncpy(global_xbus->label, "mmap:0", LABEL_SIZE); - + xframe_queue_init(&txpool, 10, 200, "mmap_txpool", global_xbus); if (!(proc_entry = create_proc_entry("xpp_mmap", 0, global_xbus->proc_xbus_dir))) { ERR("create_proc_entry() failed\n"); diff --git a/drivers/dahdi/xpp/print_fxo_modes.c b/drivers/dahdi/xpp/print_fxo_modes.c index 6d7d747..7ecab36 100644 --- a/drivers/dahdi/xpp/print_fxo_modes.c +++ b/drivers/dahdi/xpp/print_fxo_modes.c @@ -3,22 +3,22 @@ int main(int argc, char *argv[]) { size_t i; - + for (i=0; i<(sizeof(fxo_modes)/sizeof(struct fxo_mode)); i++) { if (fxo_modes[i].name == NULL) break; int reg16=0, reg26=0, reg30=0, reg31=0x20; char ring_osc[BUFSIZ]="", ring_x[BUFSIZ] = ""; - + reg16 |= (fxo_modes[i].ohs << 6); reg16 |= (fxo_modes[i].rz << 1); reg16 |= (fxo_modes[i].rt); - + reg26 |= (fxo_modes[i].dcv << 6); reg26 |= (fxo_modes[i].mini << 4); reg26 |= (fxo_modes[i].ilim << 1); - + reg30 = (fxo_modes[i].acim); - + reg31 |= (fxo_modes[i].ohs2 << 3); if (fxo_modes[i].ring_osc) diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index fc9217f..6e02313 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -269,7 +269,7 @@ void dump_xframe(const char msg[], const xbus_t *xbus, const xframe_t *xframe, i int num = 1; bool do_print; unsigned long flags; - + if(xframe->xframe_magic != XFRAME_MAGIC) { XBUS_ERR(xbus, "%s: bad xframe_magic %lX\n", __FUNCTION__, xframe->xframe_magic); @@ -372,7 +372,7 @@ int send_pcm_frame(xbus_t *xbus, xframe_t *xframe) XBUS_COUNTER(xbus, TX_BYTES) += XFRAME_LEN(xframe); return ret; -error: +error: FREE_SEND_XFRAME(xbus, xframe); return ret; } @@ -1468,7 +1468,7 @@ xbus_t *xbus_new(struct xbus_ops *ops, ushort max_send_size, struct device *tran atomic_set(&xbus->pcm_rx_counter, 0); xbus->min_tx_sync = INT_MAX; xbus->min_rx_sync = INT_MAX; - + kref_init(&xbus->kref); worker_init(xbus); atomic_set(&xbus->num_xpds, 0); diff --git a/drivers/dahdi/xpp/xbus-pcm.c b/drivers/dahdi/xpp/xbus-pcm.c index a93de5e..4c9fd27 100644 --- a/drivers/dahdi/xpp/xbus-pcm.c +++ b/drivers/dahdi/xpp/xbus-pcm.c @@ -230,7 +230,7 @@ static void xpp_drift_step(xbus_t *xbus, const struct timeval *tv) sample_tick(xbus, usec_delta); if ((ticker->count % SYNC_CYCLE) > (SYNC_CYCLE - SYNC_CYCLE_SAMPLE)) di->delta_sum += usec_delta; - + if((ticker->count % SYNC_CYCLE) == 0) { /* * Full sampling cycle passed. Let's calculate @@ -247,10 +247,10 @@ static void xpp_drift_step(xbus_t *xbus, const struct timeval *tv) speed = best_speed + 1; } else { if (offset > 0) { - if (offset > offset_prev) + if (offset > offset_prev) fix--; } else { - if (offset < offset_prev) + if (offset < offset_prev) fix++; } speed += fix; @@ -270,7 +270,7 @@ static void xpp_drift_step(xbus_t *xbus, const struct timeval *tv) XBUS_DBG(SYNC, xbus, "offset: %d, min_speed=%d, max_speed=%d, usec_delta(last)=%ld\n", offset_prev, di->min_speed, di->max_speed, usec_delta); - XBUS_DBG(SYNC, xbus, "ADJ: speed=%d (best_speed=%d) fix=%d\n", + XBUS_DBG(SYNC, xbus, "ADJ: speed=%d (best_speed=%d) fix=%d\n", speed, best_speed, fix); xbus->sync_adjustment_offset = speed; if(xbus != syncer && xbus->sync_adjustment != speed) @@ -758,7 +758,7 @@ static void do_ec(xpd_t *xpd) /* Okay, now we get to the signalling. You have several options: */ /* Option 1: If you're a T1 like interface, you can just provide a - rbsbits function and we'll assert robbed bits for you. Be sure to + rbsbits function and we'll assert robbed bits for you. Be sure to set the DAHDI_FLAG_RBS in this case. */ /* Opt: If the span uses A/B bits, set them here */ @@ -1050,7 +1050,7 @@ static void xbus_tick(xbus_t *xbus) #ifdef OPTIMIZE_CHANMUTE int j; xpp_line_t xmit_mask = PHONEDEV(xpd).wanted_pcm_mask; - + xmit_mask |= PHONEDEV(xpd).silence_pcm; xmit_mask |= PHONEDEV(xpd).digital_signalling; for_each_line(xpd, j) { diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c index 31835bb..f730ec1 100644 --- a/drivers/dahdi/xpp/xbus-sysfs.c +++ b/drivers/dahdi/xpp/xbus-sysfs.c @@ -188,7 +188,7 @@ static DEVICE_ATTR_WRITER(cls_store, dev, buf, count) xbus->max_rx_sync = 0; #ifdef SAMPLE_TICKS memset(xbus->sample_ticks, 0, sizeof(*xbus->sample_ticks)); -#endif +#endif return count; } @@ -788,7 +788,7 @@ int xpd_device_register(xbus_t *xbus, xpd_t *xpd) XPD_DBG(DEVICES, xpd, "SYSFS\n"); dev->bus = &xpd_type; dev->parent = &xbus->astribank; - dev_set_name(dev, "%02d:%1x:%1x", xbus->num, xpd->addr.unit, + dev_set_name(dev, "%02d:%1x:%1x", xbus->num, xpd->addr.unit, xpd->addr.subunit); dev_set_drvdata(dev, xpd); dev->release = xpd_release; diff --git a/drivers/dahdi/xpp/xdefs.h b/drivers/dahdi/xpp/xdefs.h index c296698..0a1617f 100644 --- a/drivers/dahdi/xpp/xdefs.h +++ b/drivers/dahdi/xpp/xdefs.h @@ -102,11 +102,11 @@ typedef unsigned char byte; #ifdef __KERNEL__ /* Kernel versions... */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) #define KMEM_CACHE_T kmem_cache_t -#else +#else #define KMEM_CACHE_T struct kmem_cache -#endif +#endif #define KZALLOC(size, gfp) my_kzalloc(size, gfp) #define KZFREE(p) do { \ @@ -145,7 +145,7 @@ typedef unsigned char byte; #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) -/* Also don't define this for later RHEL >= 5.2 . hex_asc is from the +/* Also don't define this for later RHEL >= 5.2 . hex_asc is from the * same linux-2.6-net-infrastructure-updates-to-mac80211-iwl4965.patch * as is the bool typedef. */ #if LINUX_VERSION_CODE != KERNEL_VERSION(2,6,18) || ! defined(hex_asc) diff --git a/drivers/dahdi/xpp/xframe_queue.c b/drivers/dahdi/xpp/xframe_queue.c index 6014961..c94cfb9 100644 --- a/drivers/dahdi/xpp/xframe_queue.c +++ b/drivers/dahdi/xpp/xframe_queue.c @@ -104,7 +104,7 @@ static xframe_t *__xframe_dequeue(struct xframe_queue *q) --q->count; frm = list_entry(h, xframe_t, frame_list); do_gettimeofday(&now); - usec_lag = + usec_lag = (now.tv_sec - frm->tv_queued.tv_sec)*1000*1000 + (now.tv_usec - frm->tv_queued.tv_usec); if(q->worst_lag_usec < usec_lag) diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 1bfed84..efc112e 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -824,7 +824,7 @@ int xpp_maint(struct dahdi_span *span, int cmd) ret = -EINVAL; break; } - if (span->mainttimer || span->maintstat) + if (span->mainttimer || span->maintstat) update_xpd_status(xpd, DAHDI_ALARM_LOOPBACK); return ret; } diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c index 7727cc5..c581078 100644 --- a/drivers/dahdi/xpp/xpp_usb.c +++ b/drivers/dahdi/xpp/xpp_usb.c @@ -173,7 +173,7 @@ typedef struct xusb xusb_t; /* * A uframe is our low level representation of a frame. - * + * * It contains the metadata for the usb stack (a urb) * and the metadata for the xbus-core (an xframe) * as well as pointing to the data (transfer_buffer, transfer_buffer_length) @@ -309,7 +309,7 @@ static xframe_t *alloc_xframe(xbus_t *xbus, gfp_t gfp_flags) "abort allocations during device disconnect (%d)\n", rate_limit); return NULL; } - size = min(xusb->endpoints[XUSB_SEND].max_size, xusb->endpoints[XUSB_RECV].max_size); + size = min(xusb->endpoints[XUSB_SEND].max_size, xusb->endpoints[XUSB_RECV].max_size); uframe = kmem_cache_alloc(xusb_cache, gfp_flags); if(!uframe) { if((rate_limit++ % 1003) == 0) @@ -542,7 +542,7 @@ static struct file_operations xusb_fops = { .owner = THIS_MODULE, }; -/* +/* * usb class driver info in order to get a minor number from the usb core, * and to have the device registered with devfs and the driver core */ @@ -558,7 +558,7 @@ static struct usb_class_driver xusb_class = { /* * Check that an endpoint's wMaxPacketSize attribute is 512. This - * indicates that it is a USB2's high speed end point. + * indicates that it is a USB2's high speed end point. * * If it is 64, it means we have a USB1 controller. By default we do not * support it and just fail the probe of the device. However if the user @@ -574,11 +574,11 @@ static int check_usb1(struct usb_endpoint_descriptor *endpoint) return 1; if(usb1) { - NOTICE("USB1 endpoint detected: USB %s endpoint 0x%X support only wMaxPacketSize=%d.\n", + NOTICE("USB1 endpoint detected: USB %s endpoint 0x%X support only wMaxPacketSize=%d.\n", msg, endpoint->bEndpointAddress, endpoint->wMaxPacketSize); return 1; } - NOTICE("USB1 endpoint detected. Device disabled. To enable: usb1=1, and read docs. (%s, endpoint %d, size %d).\n", + NOTICE("USB1 endpoint detected. Device disabled. To enable: usb1=1, and read docs. (%s, endpoint %d, size %d).\n", msg, endpoint->bEndpointAddress, endpoint->wMaxPacketSize); return 0; } @@ -600,7 +600,7 @@ static int set_endpoints(xusb_t *xusb, struct usb_host_interface *iface_desc, st for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; ep_addr = endpoint->bEndpointAddress; - + if(!BULK_ENDPOINT(endpoint)) { DBG(DEVICES, "endpoint 0x%x is not bulk: mbAttributes=0x%X\n", ep_addr, endpoint->bmAttributes); @@ -664,7 +664,7 @@ static int xusb_probe(struct usb_interface *interface, const struct usb_device_i unsigned long flags; int retval = -ENOMEM; int i; - + DBG(DEVICES, "New XUSB device MODEL=%s\n", model_info->desc); if(iface_desc->desc.bInterfaceNumber != model_info->iface_num) { DBG(DEVICES, "Skip interface #%d != #%d\n", @@ -676,7 +676,7 @@ static int xusb_probe(struct usb_interface *interface, const struct usb_device_i goto probe_failed; } if (!model_info) { - ERR("Missing endpoint setup for this device %d:%d\n", + ERR("Missing endpoint setup for this device %d:%d\n", udev->descriptor.idVendor,udev->descriptor.idProduct); retval = -ENODEV; goto probe_failed; @@ -996,7 +996,7 @@ static int __init xpp_usb_init(void) 0, 0, #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) - NULL, + NULL, #endif NULL); if(!xusb_cache) { diff --git a/drivers/dahdi/xpp/xproto.c b/drivers/dahdi/xpp/xproto.c index c5c263a..e07e3d1 100644 --- a/drivers/dahdi/xpp/xproto.c +++ b/drivers/dahdi/xpp/xproto.c @@ -155,7 +155,7 @@ static int packet_process(xbus_t *xbus, xpacket_t *pack) /*-------- Validations -----------*/ if(!xe) { const xproto_table_t *xtable; - + if(!xpd) { if(printk_ratelimit()) { XBUS_NOTICE(xbus, "%s: from %d%d opcode=0x%02X: no such global command.\n", @@ -379,23 +379,23 @@ void dump_reg_cmd(const char msg[], bool writing, xbus_t *xbus, action = (REG_FIELD(regcmd, read_request)) ? 'R' : 'W'; modifier = 'D'; if(REG_FIELD(regcmd, do_subreg)) { - snprintf(reg_buf, MAX_PROC_WRITE, "%02X %02X", + snprintf(reg_buf, MAX_PROC_WRITE, "%02X %02X", REG_FIELD(regcmd, regnum), REG_FIELD(regcmd, subreg)); modifier = 'S'; } else { - snprintf(reg_buf, MAX_PROC_WRITE, "%02X", + snprintf(reg_buf, MAX_PROC_WRITE, "%02X", REG_FIELD(regcmd, regnum)); } if(REG_FIELD(regcmd, read_request)) { data_buf[0] = '\0'; } else if(REG_FIELD(regcmd, do_datah)) { - snprintf(data_buf, MAX_PROC_WRITE, "%02X %02X", + snprintf(data_buf, MAX_PROC_WRITE, "%02X %02X", REG_FIELD(regcmd, data_low), REG_FIELD(regcmd, data_high)); modifier = 'I'; } else { - snprintf(data_buf, MAX_PROC_WRITE, "%02X", + snprintf(data_buf, MAX_PROC_WRITE, "%02X", REG_FIELD(regcmd, data_low)); } PORT_DBG(REGS, xbus, unit, port, "%s: %s %c%c %s %s\n", @@ -432,7 +432,7 @@ int xproto_register(const xproto_table_t *proto_table) const char *name; const struct xops *xops; const struct phoneops *phoneops; - + BUG_ON(!proto_table); type = proto_table->type; name = proto_table->name; @@ -471,7 +471,7 @@ void xproto_unregister(const xproto_table_t *proto_table) { int type; const char *name; - + BUG_ON(!proto_table); type = proto_table->type; name = proto_table->name; |