From: Greg Kroah-Hartman <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
zd_chip.c | 62 ++++++++++++++++++++++++++++----------------------------
zd_ieee80211.c | 8 ++++---
zd_mac.c | 38 +++++++++++++++++-----------------
zd_netdev.c | 6 +++--
zd_rf_rf2959.c | 8 ++++---
zd_usb.c | 50 +++++++++++++++++++++++----------------------
6 files changed, 86 insertions(+), 86 deletions(-)
ac550915ac7a2f66602a7c7fb68b59f6fdf733f9
diff --git a/zd_chip.c b/zd_chip.c
index 25331ad..b72a188 100644
--- a/zd_chip.c
+++ b/zd_chip.c
@@ -79,9 +79,9 @@ static void print_id(struct zd_chip *chi
}
/* Read a variable number of 32-bit values. Parameter count is not allowed to
- * exceed USB_MAX_IOREAD32_COUNT.
+ * exceed USB_MAX_IOREAD32_COUNT.
*/
-int zd_ioread32v(struct zd_chip *chip, u32 *values, const zd_addr_t *addr,
+int zd_ioread32v(struct zd_chip *chip, u32 *values, const zd_addr_t *addr,
unsigned int count)
{
int r;
@@ -188,7 +188,7 @@ int zd_iowrite16a(struct zd_chip *chip,
t = 1; break;
}
}
-
+
r = zd_usb_iowrite16v(&chip->usb, &ioreqs[i], j);
if (r) {
PDEBUGF("error zd_usb_iowrite16v. Error number %d", r);
@@ -219,7 +219,7 @@ int zd_iowrite32a(struct zd_chip *chip,
t = 1; break;
}
}
-
+
r = _zd_iowrite32v(chip, &ioreqs[i], j);
if (r) {
PDEBUGF("error _zd_iowrite32v. Error number %d", r);
@@ -331,16 +331,16 @@ static int _read_mac_addr(struct zd_chip
mac_addr[4] = parts[1];
mac_addr[5] = parts[1] >> 8;
- PDEBUGFG("mac addr %02x:%02x:%02x:%02x:%02x:%02x",
+ PDEBUGFG("mac addr %02x:%02x:%02x:%02x:%02x:%02x",
mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3],
- mac_addr[4], mac_addr[5]);
+ mac_addr[4], mac_addr[5]);
return 0;
}
static int read_e2p_mac_addr(struct zd_chip *chip)
{
static const zd_addr_t addr[2] = { E2P_MAC_ADDR_P1, E2P_MAC_ADDR_P2 };
-
+
ZD_ASSERT(mutex_is_locked(&chip->mutex));
return _read_mac_addr(chip, chip->e2p_mac, (const zd_addr_t *)addr);
}
@@ -364,7 +364,7 @@ static int read_mac_addr(struct zd_chip
int zd_read_mac_addr(struct zd_chip *chip, u8 *mac_addr)
{
int r;
-
+
PDEBUGF("");
mutex_lock(&chip->mutex);
r = read_mac_addr(chip, mac_addr);
@@ -387,9 +387,9 @@ int zd_write_mac_addr(struct zd_chip *ch
reqs[1].value = (mac_addr[5] << 8)
| mac_addr[4];
- PDEBUGF("mac addr %02x:%02x:%02x:%02x:%02x:%02x",
+ PDEBUGF("mac addr %02x:%02x:%02x:%02x:%02x:%02x",
mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3],
- mac_addr[4], mac_addr[5]);
+ mac_addr[4], mac_addr[5]);
mutex_lock(&chip->mutex);
r = zd_iowrite32a(chip, reqs, ARRAY_SIZE(reqs));
@@ -425,13 +425,13 @@ static int read_values(struct zd_chip *c
{
int i, r;
u32 v;
-
+
ZD_ASSERT(mutex_is_locked(&chip->mutex));
r = zd_ioread32(chip, &v, e2p_addr);
if (r)
return r;
v -= E2P_PWR_INT_GUARD;
-
+
r = E2P_CHANNEL_COUNT-offset;
if (r > 4)
r = 4;
@@ -490,7 +490,7 @@ int zd_chip_unlock_phy_regs(struct zd_ch
ZD_ASSERT(mutex_is_locked(&chip->mutex));
r = zd_ioread32(chip, &tmp, CR_REG1);
- if (r) {
+ if (r) {
PERROR("error ioread32(CR_REG1): %d", r);
return r;
}
@@ -532,7 +532,7 @@ static int patch_6m_band_edge(struct zd_
{ CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
{ CR47, 0x1e },
};
-
+
if (!chip->patch_6m_band_edge || !chip->rf.patch_6m_band_edge)
return 0;
@@ -612,7 +612,7 @@ static int hw_reset_phy(struct zd_chip *
};
int r, t;
-
+
PDEBUGF("");
r = zd_chip_lock_phy_regs(chip);
@@ -696,7 +696,7 @@ static int get_aw_pt_bi(struct zd_chip *
s->beacon_interval);
return 0;
}
-
+
static int set_aw_pt_bi(struct zd_chip *chip, struct aw_pt_bi *s)
{
struct zd_ioreq32 reqs[3];
@@ -917,11 +917,11 @@ int zd_chip_init_hw(struct zd_chip *chip
goto out;
#endif
r = zd_iowrite32(chip, 1, CR_AFTER_PNP);
- if (r)
+ if (r)
goto out;
r = zd_usb_init_hw(&chip->usb);
- if (r)
+ if (r)
goto out;
/* GPI is always disabled, also in the other driver.
@@ -938,7 +938,7 @@ int zd_chip_init_hw(struct zd_chip *chip
/* Disabling interrupts is certainly a smart thing here.
*/
r = disable_hwint(chip);
- if (r)
+ if (r)
goto out;
r = read_pod(chip, &rf_type);
if (r)
@@ -1132,7 +1132,7 @@ int zd_chip_set_basic_rates(struct zd_ch
struct zd_mac *mac = zd_chip_to_mac(chip);
int i, r;
-
+
if (cr_rates & ~(CR_RATES_80211B|CR_RATES_80211G))
return -EINVAL;
@@ -1150,7 +1150,7 @@ int zd_chip_set_basic_rates(struct zd_ch
if (cr_rates & (1 << i))
break;
}
- ZD_ASSERT(i >= 0);
+ ZD_ASSERT(i >= 0);
zd_mac_set_max_basic_rate(mac, cs_rates[i]);
return 0;
}
@@ -1158,7 +1158,7 @@ int zd_chip_set_basic_rates(struct zd_ch
int zd_chip_get_basic_rates(struct zd_chip *chip, u16 *cr_rates)
{
int r;
-
+
mutex_lock(&chip->mutex);
r = zd_ioread16(chip, cr_rates, CR_BASIC_RATE_TBL);
mutex_unlock(&chip->mutex);
@@ -1186,7 +1186,7 @@ static unsigned int log10times100(unsign
214, 215, 215, 215, 216, 216, 216, 217, 217, 217,
217, 218, 218, 218, 219, 219, 219, 219, 220, 220,
220, 220, 221, 221, 221, 222, 222, 222, 222, 223,
- 223, 223, 223, 224, 224, 224, 224,
+ 223, 223, 223, 224, 224, 224, 224,
};
return x < ARRAY_SIZE(log10) ? log10[x] : 225;
@@ -1202,7 +1202,7 @@ static int to_dB(u32 x, u8 rate)
65, 50, 40, 25, 15
};
- // It seems that their quality parameter is somehow per signal
+ // It seems that their quality parameter is somehow per signal
// and is now transferred per bit.
switch (rate) {
case ZD_OFDM_RATE_6M:
@@ -1220,7 +1220,7 @@ static int to_dB(u32 x, u8 rate)
return -EINVAL;
}
-
+
for (i = 0; i < ARRAY_SIZE(constants); i++) {
if (x > constants[i])
break;
@@ -1252,7 +1252,7 @@ static int compute_ofdm_signal_quality(u
r = to_dB((10000 * status_quality) / size, rate);
if (r < 0)
return r;
- // ZYDAS changed that from 2.2.0.0 to 2.3.1.0
+ // ZYDAS changed that from 2.2.0.0 to 2.3.1.0
// r += 5;
r *= 4;
return r < 100 ? r : 100;
@@ -1278,7 +1278,7 @@ static int compute_cck_signal_quality(u8
* it by adding some value and multiplying by four. However they don't seem
* to have a good understanding for it, they changes between versions show
* it.
- *
+ *
* The CCK quality value seems to be related to the EVM, because Zydas uses the
* typical 20*log10 expression. However the EVM itself gives a fairly well
* percentage. I would suggest to use following approach measure the maximum
@@ -1336,7 +1336,7 @@ int zd_rx_signal_strength_in_percent(con
return -EINVAL;
if (status->frame_status & ZD_RX_ERROR)
return -EINVAL;
-
+
r = status->signal_strength;
if (r > 60)
r = 60;
@@ -1417,11 +1417,11 @@ int zd_get_encryption_type(struct zd_chi
mutex_unlock(&chip->mutex);
return r;
}
-
+
int zd_set_encryption_type(struct zd_chip *chip, u32 type)
{
int r;
-
+
mutex_lock(&chip->mutex);
r = zd_iowrite32(chip, type, CR_ENCRYPTION_TYPE);
mutex_unlock(&chip->mutex);
@@ -1445,6 +1445,6 @@ int zd_get_pre_tbtt(struct zd_chip *chip
mutex_lock(&chip->mutex);
r = zd_ioread32(chip, pre_tbtt, CR_PRE_TBTT);
mutex_unlock(&chip->mutex);
-
+
return r;
}
diff --git a/zd_ieee80211.c b/zd_ieee80211.c
index 7ed64ce..8b15c4b 100644
--- a/zd_ieee80211.c
+++ b/zd_ieee80211.c
@@ -48,7 +48,7 @@ static const u16 channel_frequencies[] =
#define NUM_CHANNELS ARRAY_SIZE(channel_frequencies)
static int compute_freq(struct iw_freq *freq, u32 mhz, u32 hz)
-{
+{
u32 factor;
freq->e = 0;
@@ -92,10 +92,10 @@ static int freq_to_mhz(const struct iw_f
int e;
/* Such high frequencies are not supported. */
- if (freq->e > 6)
+ if (freq->e > 6)
return -EINVAL;
- factor = 1;
+ factor = 1;
for (e = freq->e; e > 0; --e) {
factor *= 10;
}
@@ -112,7 +112,7 @@ int zd_find_channel(u8 *channel, const s
{
int i, r;
u32 mhz;
-
+
if (!(freq->flags & IW_FREQ_FIXED))
return 0;
diff --git a/zd_mac.c b/zd_mac.c
index 68c8a1e..0537078 100644
--- a/zd_mac.c
+++ b/zd_mac.c
@@ -124,7 +124,7 @@ out:
void zd_mac_clear(struct zd_mac *mac)
{
- /* Aquire the lock. */
+ /* Aquire the lock. */
spin_lock(&mac->lock);
spin_unlock(&mac->lock);
zd_chip_clear(&mac->chip);
@@ -195,7 +195,7 @@ int zd_mac_stop(struct net_device *netde
{
struct zd_mac *mac = zd_netdev_mac(netdev);
struct zd_chip *chip = &mac->chip;
-
+
ieee80211softmac_stop(netdev);
zd_chip_disable_hwint(chip);
zd_chip_disable_rx(chip);
@@ -209,7 +209,7 @@ int zd_mac_set_regdomain(struct zd_mac *
{
int r;
u8 channel;
-
+
ZD_ASSERT(!irqs_disabled());
spin_lock_irq(&mac->lock);
if (regdomain == 0) {
@@ -222,7 +222,7 @@ int zd_mac_set_regdomain(struct zd_mac *
mac->regdomain = regdomain;
channel = mac->channel;
spin_unlock_irq(&mac->lock);
-
+
if (!zd_regdomain_supports_channel(regdomain, channel)) {
r = reset_channel(mac);
if (r)
@@ -236,7 +236,7 @@ u8 zd_mac_get_regdomain(struct zd_mac *m
{
unsigned long flags;
u8 regdomain;
-
+
spin_lock_irqsave(&mac->lock, flags);
regdomain = mac->regdomain;
spin_unlock_irqrestore(&mac->lock, flags);
@@ -268,9 +268,9 @@ int zd_mac_set_channel(struct zd_mac *ma
mac->channel = channel;
mac->channel_is_fixed = !!(flags & MAC_FIXED_CHANNEL);
spin_unlock_irqrestore(&mac->lock, lock_flags);
- if (netif_running(mac->netdev))
+ if (netif_running(mac->netdev))
return zd_chip_set_channel(&mac->chip, channel);
- else
+ else
return 0;
}
@@ -297,7 +297,7 @@ static u8 cs_typed_rate(u8 cs_rate)
[ZD_CS_CCK_RATE_11M] = ZD_CS_CCK|ZD_CS_CCK_RATE_11M,
[ZD_OFDM_RATE_6M] = ZD_CS_OFDM|ZD_OFDM_RATE_6M,
[ZD_OFDM_RATE_9M] = ZD_CS_OFDM|ZD_OFDM_RATE_9M,
- [ZD_OFDM_RATE_12M] = ZD_CS_OFDM|ZD_OFDM_RATE_12M,
+ [ZD_OFDM_RATE_12M] = ZD_CS_OFDM|ZD_OFDM_RATE_12M,
[ZD_OFDM_RATE_18M] = ZD_CS_OFDM|ZD_OFDM_RATE_18M,
[ZD_OFDM_RATE_24M] = ZD_CS_OFDM|ZD_OFDM_RATE_24M,
[ZD_OFDM_RATE_36M] = ZD_CS_OFDM|ZD_OFDM_RATE_36M,
@@ -338,7 +338,7 @@ static u8 get_max_basic_rate(struct zd_m
spin_unlock_irqrestore(&mac->lock, flags);
return rate;
}
-
+
void zd_mac_set_max_basic_rate(struct zd_mac *mac, u8 cs_rate)
{
unsigned long flags;
@@ -346,7 +346,7 @@ void zd_mac_set_max_basic_rate(struct zd
/* Wrong rates will be downgraded to slowest rate */
cs_rate = cs_typed_rate(cs_rate) & ZD_CS_RATE_MASK;
spin_lock_irqsave(&mac->lock, flags);
- mac->max_basic_rate = cs_rate;
+ mac->max_basic_rate = cs_rate;
spin_unlock_irqrestore(&mac->lock, flags);
}
@@ -384,7 +384,7 @@ int zd_mac_get_mode(struct zd_mac *mac,
{
unsigned long flags;
struct ieee80211_device *ieee;
-
+
ieee = zd_mac_to_ieee80211(mac);
spin_lock_irqsave(&ieee->lock, flags);
*mode = ieee->iw_mode;
@@ -401,7 +401,7 @@ int zd_mac_get_range(struct zd_mac *mac,
memset(range, 0, sizeof(*range));
range->throughput = 27 * 1000 * 1000;
-
+
/* FIXME: Not so important and depends on the mode. Measure it and put
* numbers here. */
range->throughput = 27 * 1000 * 1000;
@@ -424,7 +424,7 @@ int zd_mac_get_range(struct zd_mac *mac,
range->num_encoding_sizes = 2;
range->encoding_size[0] = 5;
range->encoding_size[1] = WEP_KEY_LEN;
-
+
range->we_version_compiled = WIRELESS_EXT;
range->we_version_source = 19;
@@ -433,7 +433,7 @@ int zd_mac_get_range(struct zd_mac *mac,
regdomain = mac->regdomain;
spin_unlock_irq(&mac->lock);
channel_range = zd_channel_range(regdomain);
-
+
range->num_channels = channel_range->end - channel_range->start;
range->num_frequency = range->num_channels;
@@ -515,7 +515,7 @@ static u8 cs_rate_to_modulation(u8 cs_ra
return modulation;
}
-static void cs_set_modulation(struct zd_mac *mac, struct zd_ctrlset *cs,
+static void cs_set_modulation(struct zd_mac *mac, struct zd_ctrlset *cs,
struct ieee80211_hdr_4addr *header)
{
struct ieee80211softmac_device *softmac = ieee80211_priv(mac->netdev);
@@ -537,7 +537,7 @@ static void cs_set_modulation(struct zd_
* long is normal, short is better, but we can only use short if
* the AP says so. the stored preamble setting is only used in
* unicast transfers.
- *
+ *
* - if mgt frame, use highest available basic rate as standard
* - the AP will publish a list of available rates which we will
* save into reg 0x630
@@ -753,11 +753,11 @@ static int is_data_packet_for_us(struct
switch (ieee->iw_mode) {
case IW_MODE_ADHOC:
- if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) != 0 ||
+ if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) != 0 ||
memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) != 0)
return 0;
break;
- case IW_MODE_AUTO:
+ case IW_MODE_AUTO:
case IW_MODE_INFRA:
if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) !=
IEEE80211_FCTL_FROMDS ||
@@ -870,7 +870,7 @@ static void set_security(struct net_devi
struct ieee80211_device *ieee = zd_netdev_ieee80211(netdev);
struct ieee80211_security *secinfo = &ieee->sec;
int keyidx;
-
+
PDEBUGF("");
for (keyidx = 0; keyidx<WEP_KEYS; keyidx++)
diff --git a/zd_netdev.c b/zd_netdev.c
index c7fb85f..423afbf 100644
--- a/zd_netdev.c
+++ b/zd_netdev.c
@@ -72,7 +72,7 @@ static int iw_get_name(struct net_device
struct iw_request_info *info,
union iwreq_data *req, char *extra)
{
- /* FIXME: check whether 802.11a will also supported, add also
+ /* FIXME: check whether 802.11a will also supported, add also
* zd1211B, if we support it.
*/
strlcpy(req->name, "802.11g zd1211", IFNAMSIZ);
@@ -238,7 +238,7 @@ struct net_device *zd_netdev_alloc(struc
PDEBUGF("netdev->flags %#06hx", netdev->flags);
PDEBUGF("netdev->features %#010lx", netdev->features);
-
+
netdev->open = zd_mac_open;
netdev->stop = zd_mac_stop;
// netdev->get_stats =
@@ -246,7 +246,7 @@ struct net_device *zd_netdev_alloc(struc
// netdev->set_mac_address =
netdev->wireless_handlers = &iw_handler_def;
// netdev->ethtool_ops =
-
+
return netdev;
}
diff --git a/zd_rf_rf2959.c b/zd_rf_rf2959.c
index 2710eb2..d06cb13 100644
--- a/zd_rf_rf2959.c
+++ b/zd_rf_rf2959.c
@@ -41,7 +41,7 @@ static u32 rf2959_table[][2] = {
#if 0
static int bits(u32 rw, int from, int to)
{
- rw &= ~(0xffffffffU << (to+1));
+ rw &= ~(0xffffffffU << (to+1));
rw >>= from;
return rw;
}
@@ -92,7 +92,7 @@ static void dump_regwrite(u32 rw)
bits(rw, 7, 9), bits(rw, 4, 6), bits(rw, 0,3));
break;
case 6:
- PDEBUG("reg6 RFPLL2 n %d num %d",
+ PDEBUG("reg6 RFPLL2 n %d num %d",
bits(rw, 6, 17), bits(rw, 0, 5));
break;
case 7:
@@ -132,7 +132,7 @@ static void dump_regwrite(u32 rw)
bit(rw, 17), bit(rw, 16), bit(rw, 15),
bits(rw, 8, 9), bits(rw, 5, 7), bits(rw, 3, 4),
bits(rw, 0, 2));
- break;
+ break;
case 14:
PDEBUG("reg14 IQCAL rx_acal %d rx_pcal %d"
" tx_acal %d tx_pcal %d",
@@ -212,7 +212,7 @@ static int rf2959_init_hw(struct zd_rf *
0x340000, //REG13(0xD)
0x381e0f, //REG14(0xE)
/* Bogus, RF2959's data sheet doesn't know register 27, which is
- * actually referenced here. The commented 0x11 is 17.
+ * actually referenced here. The commented 0x11 is 17.
*/
0x6c180f, //REG27(0x11)
};
diff --git a/zd_usb.c b/zd_usb.c
index c6d5818..7c2b9b7 100644
--- a/zd_usb.c
+++ b/zd_usb.c
@@ -59,7 +59,7 @@ static int check_addr(struct zd_usb *usb
switch (base) {
case USB_BASE:
break;
- case CR_BASE:
+ case CR_BASE:
if (offset > CR_MAX_OFFSET) {
PDEBUG("CR offset %#010x larger than"
" CR_MAX_OFFSET %#10x",
@@ -112,7 +112,7 @@ static u16 usb_addr(struct zd_usb *usb,
PDEBUGFG("addr %#010x", addr);
base = ZD_ADDR_BASE(addr);
offset = ZD_OFFSET(addr);
-
+
#ifdef ZD1211_DEBUG
BUG_ON(check_addr(usb, addr));
#endif
@@ -146,18 +146,18 @@ static void print_endpoint_descriptor(in
default: xfer_type = "unknown"; break;
};
- PDEBUG("ep%d %s xfer %s max size %u",
- i, in ? "in" : "out", xfer_type,
+ PDEBUG("ep%d %s xfer %s max size %u",
+ i, in ? "in" : "out", xfer_type,
(unsigned int)le16_to_cpu(desc->wMaxPacketSize));
}
-
+
static void scan_endpoints(struct usb_interface *intf)
{
int i;
struct usb_host_interface *host_intf = intf->cur_altsetting;
for (i = 0; i < host_intf->desc.bNumEndpoints; i++) {
- struct usb_endpoint_descriptor *ep_desc =
+ struct usb_endpoint_descriptor *ep_desc =
&host_intf->endpoint[i].desc;
print_endpoint_descriptor(i, ep_desc);
@@ -202,7 +202,7 @@ static int upload_code(struct usb_device
PERROR("out of memory");
r = -ENOMEM; goto error;
}
-
+
size &= ~1;
while (size > 0) {
size_t transfer_size = size <= MAX_TRANSFER_SIZE ?
@@ -214,7 +214,7 @@ static int upload_code(struct usb_device
r = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
USB_REQ_FIRMWARE_DOWNLOAD,
USB_DIR_OUT | USB_TYPE_VENDOR,
- code_offset, 0, p, transfer_size, 1000 /* ms */);
+ code_offset, 0, p, transfer_size, 1000 /* ms */);
if (r < 0) {
PERROR("USB control request for firmware upload"
" failed. Error number %d", r);
@@ -289,7 +289,7 @@ static int upload_firmware(struct usb_de
PDEBUGF("firmware eeprom version %#06x is equal to the version of"
" the device", fw_eeprom_version);
-
+
r = request_fw_file(&uph_fw, FW_PREFIX "uphr", &udev->dev);
if (r)
goto error;
@@ -332,7 +332,7 @@ static inline void handle_regs_int(struc
if (intr->read_regs_enabled) {
intr->read_regs.length = len = urb->actual_length;
- if (len > sizeof(intr->read_regs.buffer))
+ if (len > sizeof(intr->read_regs.buffer))
len = sizeof(intr->read_regs.buffer);
memcpy(intr->read_regs.buffer, urb->transfer_buffer, len);
intr->read_regs_enabled = 0;
@@ -468,7 +468,7 @@ int zd_usb_enable_int(struct zd_usb *usb
udev = zd_usb_to_usbdev(usb);
usb_fill_int_urb(urb, udev, usb_rcvintpipe(udev, EP_INT_IN),
transfer_buffer, USB_MAX_EP_INT_BUFFER,
- int_urb_complete, usb,
+ int_urb_complete, usb,
intr->interval);
PDEBUGF("submit urb %p", intr->urb);
@@ -477,7 +477,7 @@ int zd_usb_enable_int(struct zd_usb *usb
PDEBUGF("Couldn't submit urb. Error number %d", r);
goto error;
}
-
+
return 0;
error:
kfree(transfer_buffer);
@@ -578,7 +578,7 @@ static void rx_urb_complete(struct urb *
} else {
handle_rx_frame(usb, buffer, length);
}
-
+
resubmit:
r = usb_submit_urb(urb, GFP_ATOMIC);
if (r) {
@@ -645,13 +645,13 @@ error_free_urb:
out:
return r;
}
-
+
void zd_usb_disable_rx(struct zd_usb *usb)
{
unsigned long flags;
struct urb *urb;
struct zd_usb_rx *rx = &usb->rx;
-
+
spin_lock_irqsave(&rx->lock, flags);
urb = rx->urb;
if (!urb) {
@@ -711,7 +711,7 @@ int zd_usb_tx(struct zd_usb *usb, const
struct usb_device *udev = zd_usb_to_usbdev(usb);
struct urb *urb;
void *buffer;
-
+
urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb) {
r = -ENOMEM; goto out;
@@ -723,7 +723,7 @@ int zd_usb_tx(struct zd_usb *usb, const
r = -ENOMEM; goto error_free_urb;
}
memcpy(buffer, frame, length);
-
+
usb_fill_bulk_urb(urb, udev, usb_sndbulkpipe(udev, EP_DATA_OUT),
buffer, length, tx_urb_complete, NULL);
urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
@@ -810,7 +810,7 @@ static const char *speed(enum usb_device
static int scnprint_id(struct usb_device *udev, char *buffer, size_t size)
{
- return scnprintf(buffer, size, "%04hx:%04hx v%04hx %s",
+ return scnprintf(buffer, size, "%04hx:%04hx v%04hx %s",
le16_to_cpu(udev->descriptor.idVendor),
le16_to_cpu(udev->descriptor.idProduct),
get_device_version(udev),
@@ -914,13 +914,13 @@ static void disconnect(struct usb_interf
zd_usb_disable_rx(usb);
zd_usb_disable_int(usb);
- /* If the disconnect has been caused by a removal of the
+ /* If the disconnect has been caused by a removal of the
* driver module, the reset allows reloading of the driver. If the
* reset will not be executed here, the upload of the firmware in the
* probe function caused by the reloading of the driver will fail.
*/
usb_reset_device(interface_to_usbdev(intf));
-
+
/* If somebody still waits on this lock now, this is an error. */
zd_netdev_free(netdev);
PDEBUG("disconnected");
@@ -938,7 +938,7 @@ static int __init usb_init(void)
int r;
PDEBUGF("");
-
+
r = usb_register(&driver);
if (r) {
PERROR("usb_register failed. Error number %d", r);
@@ -998,7 +998,7 @@ static int get_results(struct zd_usb *us
rr->length, sizeof(rr->buffer));
goto error_unlock;
}
-
+
for (i = 0; i < count; i++) {
struct reg_data *rd = ®s->regs[i];
if (rd->addr != req->addr[i]) {
@@ -1026,7 +1026,7 @@ int zd_usb_ioread16v(struct zd_usb *usb,
struct usb_device *udev;
struct usb_req_read_regs *req = NULL;
unsigned long timeout;
-
+
if (count < 1) {
PDEBUGF("error: count is zero");
return -EINVAL;
@@ -1105,7 +1105,7 @@ int zd_usb_iowrite16v(struct zd_usb *usb
req_len = sizeof(struct usb_req_write_regs) +
count * sizeof(struct reg_data);
req = kmalloc(req_len, GFP_NOFS);
- if (!req)
+ if (!req)
return -ENOMEM;
req->id = cpu_to_le16(USB_REQ_WRITE_REGS);
@@ -1176,7 +1176,7 @@ int zd_usb_rfwrite(struct zd_usb *usb, u
req_len = sizeof(struct usb_req_rfwrite) + bits * sizeof(__le16);
req = kmalloc(req_len, GFP_NOFS);
- if (!req)
+ if (!req)
return -ENOMEM;
req->id = cpu_to_le16(USB_REQ_WRITE_RF);
--
1.2.6
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Zd1211-devs mailing list - http://zd1211.ath.cx/
Unsubscribe: https://lists.sourceforge.net/lists/listinfo/zd1211-devs
