diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 2 | ||||
-rw-r--r-- | drivers/char/synclink.c | 2 | ||||
-rw-r--r-- | drivers/char/synclink_gt.c | 2 | ||||
-rw-r--r-- | drivers/char/synclinkmp.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/gl520sm.c | 2 | ||||
-rw-r--r-- | drivers/i2c/chips/rtc8564.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-dma.c | 2 | ||||
-rw-r--r-- | drivers/net/sk98lin/skge.c | 2 | ||||
-rw-r--r-- | drivers/net/sky2.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/oid_mgt.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/spectrum_cs.c | 2 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mbox.c | 2 | ||||
-rw-r--r-- | drivers/usb/image/microtek.c | 2 | ||||
-rw-r--r-- | drivers/usb/input/hid-core.c | 2 | ||||
-rw-r--r-- | drivers/video/aty/radeon_pm.c | 2 |
15 files changed, 16 insertions, 16 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 8a8ca32822b..e6b714b6390 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -4181,7 +4181,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, | |||
4181 | } | 4181 | } |
4182 | 4182 | ||
4183 | info->params.encoding = new_encoding; | 4183 | info->params.encoding = new_encoding; |
4184 | info->params.crc_type = new_crctype;; | 4184 | info->params.crc_type = new_crctype; |
4185 | 4185 | ||
4186 | /* if network interface up, reprogram hardware */ | 4186 | /* if network interface up, reprogram hardware */ |
4187 | if (info->netcount) | 4187 | if (info->netcount) |
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index ede688a4e14..d68be61f0a4 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c | |||
@@ -7770,7 +7770,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, | |||
7770 | } | 7770 | } |
7771 | 7771 | ||
7772 | info->params.encoding = new_encoding; | 7772 | info->params.encoding = new_encoding; |
7773 | info->params.crc_type = new_crctype;; | 7773 | info->params.crc_type = new_crctype; |
7774 | 7774 | ||
7775 | /* if network interface up, reprogram hardware */ | 7775 | /* if network interface up, reprogram hardware */ |
7776 | if (info->netcount) | 7776 | if (info->netcount) |
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c index b046390cd25..738ec2f4e56 100644 --- a/drivers/char/synclink_gt.c +++ b/drivers/char/synclink_gt.c | |||
@@ -1365,7 +1365,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, | |||
1365 | } | 1365 | } |
1366 | 1366 | ||
1367 | info->params.encoding = new_encoding; | 1367 | info->params.encoding = new_encoding; |
1368 | info->params.crc_type = new_crctype;; | 1368 | info->params.crc_type = new_crctype; |
1369 | 1369 | ||
1370 | /* if network interface up, reprogram hardware */ | 1370 | /* if network interface up, reprogram hardware */ |
1371 | if (info->netcount) | 1371 | if (info->netcount) |
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index 960adb256fb..85874013111 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c | |||
@@ -1650,7 +1650,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, | |||
1650 | } | 1650 | } |
1651 | 1651 | ||
1652 | info->params.encoding = new_encoding; | 1652 | info->params.encoding = new_encoding; |
1653 | info->params.crc_type = new_crctype;; | 1653 | info->params.crc_type = new_crctype; |
1654 | 1654 | ||
1655 | /* if network interface up, reprogram hardware */ | 1655 | /* if network interface up, reprogram hardware */ |
1656 | if (info->netcount) | 1656 | if (info->netcount) |
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c index 47b4d49f75c..14e810f3c2c 100644 --- a/drivers/hwmon/gl520sm.c +++ b/drivers/hwmon/gl520sm.c | |||
@@ -456,7 +456,7 @@ static ssize_t set_temp_max(struct i2c_client *client, struct gl520_data *data, | |||
456 | long v = simple_strtol(buf, NULL, 10); | 456 | long v = simple_strtol(buf, NULL, 10); |
457 | 457 | ||
458 | mutex_lock(&data->update_lock); | 458 | mutex_lock(&data->update_lock); |
459 | data->temp_max[n - 1] = TEMP_TO_REG(v);; | 459 | data->temp_max[n - 1] = TEMP_TO_REG(v); |
460 | gl520_write_value(client, reg, data->temp_max[n - 1]); | 460 | gl520_write_value(client, reg, data->temp_max[n - 1]); |
461 | mutex_unlock(&data->update_lock); | 461 | mutex_unlock(&data->update_lock); |
462 | return count; | 462 | return count; |
diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c index ceaa6b0bdfd..0d8699b3f48 100644 --- a/drivers/i2c/chips/rtc8564.c +++ b/drivers/i2c/chips/rtc8564.c | |||
@@ -53,7 +53,7 @@ static inline u8 _rtc8564_ctrl2(struct i2c_client *client) | |||
53 | #define CTRL1(c) _rtc8564_ctrl1(c) | 53 | #define CTRL1(c) _rtc8564_ctrl1(c) |
54 | #define CTRL2(c) _rtc8564_ctrl2(c) | 54 | #define CTRL2(c) _rtc8564_ctrl2(c) |
55 | 55 | ||
56 | static int debug;; | 56 | static int debug; |
57 | module_param(debug, int, S_IRUGO | S_IWUSR); | 57 | module_param(debug, int, S_IRUGO | S_IWUSR); |
58 | 58 | ||
59 | static struct i2c_driver rtc8564_driver; | 59 | static struct i2c_driver rtc8564_driver; |
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 0523da77425..c481be8b807 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -175,7 +175,7 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive) | |||
175 | if (rq->rq_disk) { | 175 | if (rq->rq_disk) { |
176 | ide_driver_t *drv; | 176 | ide_driver_t *drv; |
177 | 177 | ||
178 | drv = *(ide_driver_t **)rq->rq_disk->private_data;; | 178 | drv = *(ide_driver_t **)rq->rq_disk->private_data; |
179 | drv->end_request(drive, 1, rq->nr_sectors); | 179 | drv->end_request(drive, 1, rq->nr_sectors); |
180 | } else | 180 | } else |
181 | ide_end_request(drive, 1, rq->nr_sectors); | 181 | ide_end_request(drive, 1, rq->nr_sectors); |
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index a5f2b1ee075..38a26df4095 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c | |||
@@ -1727,7 +1727,7 @@ struct sk_buff *pMessage) /* pointer to send-message */ | |||
1727 | pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32); | 1727 | pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32); |
1728 | pTxd->pMBuf = pMessage; | 1728 | pTxd->pMBuf = pMessage; |
1729 | 1729 | ||
1730 | pTxd->TBControl = Control | BMU_OWN | sk_frag->size;; | 1730 | pTxd->TBControl = Control | BMU_OWN | sk_frag->size; |
1731 | 1731 | ||
1732 | /* | 1732 | /* |
1733 | ** Do we have the last fragment? | 1733 | ** Do we have the last fragment? |
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 2838f661b39..62532b4e45c 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
@@ -1804,7 +1804,7 @@ struct sky2_rx_le { | |||
1804 | __le16 length; | 1804 | __le16 length; |
1805 | u8 ctrl; | 1805 | u8 ctrl; |
1806 | u8 opcode; | 1806 | u8 opcode; |
1807 | } __attribute((packed));; | 1807 | } __attribute((packed)); |
1808 | 1808 | ||
1809 | struct sky2_status_le { | 1809 | struct sky2_status_le { |
1810 | __le32 status; /* also checksum */ | 1810 | __le32 status; /* also checksum */ |
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c index eea2f04c8c6..ebb23878583 100644 --- a/drivers/net/wireless/prism54/oid_mgt.c +++ b/drivers/net/wireless/prism54/oid_mgt.c | |||
@@ -332,7 +332,7 @@ mgt_le_to_cpu(int type, void *data) | |||
332 | case OID_TYPE_ATTACH:{ | 332 | case OID_TYPE_ATTACH:{ |
333 | struct obj_attachment *attach = data; | 333 | struct obj_attachment *attach = data; |
334 | attach->id = le16_to_cpu(attach->id); | 334 | attach->id = le16_to_cpu(attach->id); |
335 | attach->size = le16_to_cpu(attach->size);; | 335 | attach->size = le16_to_cpu(attach->size); |
336 | break; | 336 | break; |
337 | } | 337 | } |
338 | case OID_TYPE_SSID: | 338 | case OID_TYPE_SSID: |
@@ -401,7 +401,7 @@ mgt_cpu_to_le(int type, void *data) | |||
401 | case OID_TYPE_ATTACH:{ | 401 | case OID_TYPE_ATTACH:{ |
402 | struct obj_attachment *attach = data; | 402 | struct obj_attachment *attach = data; |
403 | attach->id = cpu_to_le16(attach->id); | 403 | attach->id = cpu_to_le16(attach->id); |
404 | attach->size = cpu_to_le16(attach->size);; | 404 | attach->size = cpu_to_le16(attach->size); |
405 | break; | 405 | break; |
406 | } | 406 | } |
407 | case OID_TYPE_SSID: | 407 | case OID_TYPE_SSID: |
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c index fee4be1ce81..5fa6fbe35bb 100644 --- a/drivers/net/wireless/spectrum_cs.c +++ b/drivers/net/wireless/spectrum_cs.c | |||
@@ -147,7 +147,7 @@ struct pdi { | |||
147 | __le16 _len; /* length of ID and data, in words */ | 147 | __le16 _len; /* length of ID and data, in words */ |
148 | __le16 _id; /* record ID */ | 148 | __le16 _id; /* record ID */ |
149 | char data[0]; /* plug data */ | 149 | char data[0]; /* plug data */ |
150 | } __attribute__ ((packed));; | 150 | } __attribute__ ((packed)); |
151 | 151 | ||
152 | 152 | ||
153 | /* Functions for access to little-endian data */ | 153 | /* Functions for access to little-endian data */ |
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index bf9f7f7ba35..c11e5ce6865 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -2797,7 +2797,7 @@ mbox_post_sync_cmd(adapter_t *adapter, uint8_t raw_mbox[]) | |||
2797 | // available within 1 second, assume FW is initializing and wait | 2797 | // available within 1 second, assume FW is initializing and wait |
2798 | // for an extended amount of time | 2798 | // for an extended amount of time |
2799 | if (mbox->numstatus == 0xFF) { // status not yet available | 2799 | if (mbox->numstatus == 0xFF) { // status not yet available |
2800 | udelay(25);; | 2800 | udelay(25); |
2801 | 2801 | ||
2802 | for (i = 0; mbox->numstatus == 0xFF && i < 1000; i++) { | 2802 | for (i = 0; mbox->numstatus == 0xFF && i < 1000; i++) { |
2803 | rmb(); | 2803 | rmb(); |
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index 28538db9eaf..2a0e18a4874 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c | |||
@@ -360,7 +360,7 @@ static int mts_scsi_host_reset (Scsi_Cmnd *srb) | |||
360 | rc = usb_lock_device_for_reset(desc->usb_dev, desc->usb_intf); | 360 | rc = usb_lock_device_for_reset(desc->usb_dev, desc->usb_intf); |
361 | if (rc < 0) | 361 | if (rc < 0) |
362 | return FAILED; | 362 | return FAILED; |
363 | result = usb_reset_device(desc->usb_dev);; | 363 | result = usb_reset_device(desc->usb_dev); |
364 | if (rc) | 364 | if (rc) |
365 | usb_unlock_device(desc->usb_dev); | 365 | usb_unlock_device(desc->usb_dev); |
366 | return result ? FAILED : SUCCESS; | 366 | return result ? FAILED : SUCCESS; |
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 58b59f6e988..d4bf1701046 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -1215,7 +1215,7 @@ static void hid_irq_out(struct urb *urb, struct pt_regs *regs) | |||
1215 | 1215 | ||
1216 | if (hid->outhead != hid->outtail) { | 1216 | if (hid->outhead != hid->outtail) { |
1217 | if (hid_submit_out(hid)) { | 1217 | if (hid_submit_out(hid)) { |
1218 | clear_bit(HID_OUT_RUNNING, &hid->iofl);; | 1218 | clear_bit(HID_OUT_RUNNING, &hid->iofl); |
1219 | wake_up(&hid->wait); | 1219 | wake_up(&hid->wait); |
1220 | } | 1220 | } |
1221 | spin_unlock_irqrestore(&hid->outlock, flags); | 1221 | spin_unlock_irqrestore(&hid->outlock, flags); |
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index 1f8d805c61e..5886a2f1323 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c | |||
@@ -2080,7 +2080,7 @@ static void radeon_reinitialize_M9P(struct radeonfb_info *rinfo) | |||
2080 | OUTREG(0x2ec, 0x6332a3f0); | 2080 | OUTREG(0x2ec, 0x6332a3f0); |
2081 | mdelay(17); | 2081 | mdelay(17); |
2082 | 2082 | ||
2083 | OUTPLL(pllPPLL_REF_DIV, rinfo->pll.ref_div);; | 2083 | OUTPLL(pllPPLL_REF_DIV, rinfo->pll.ref_div); |
2084 | OUTPLL(pllPPLL_DIV_0, rinfo->save_regs[92]); | 2084 | OUTPLL(pllPPLL_DIV_0, rinfo->save_regs[92]); |
2085 | 2085 | ||
2086 | mdelay(40); | 2086 | mdelay(40); |