diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/agp/uninorth-agp.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/mga/mga_state.c | 4 | ||||
-rw-r--r-- | drivers/lguest/page_tables.c | 2 | ||||
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_core.c | 2 | ||||
-rw-r--r-- | drivers/mmc/host/mxcmmc.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/ixp2000.c | 2 | ||||
-rw-r--r-- | drivers/mtd/ubi/eba.c | 2 | ||||
-rw-r--r-- | drivers/mtd/ubi/ubi.h | 2 | ||||
-rw-r--r-- | drivers/net/bonding/bond_3ad.c | 2 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.c | 2 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 4 | ||||
-rw-r--r-- | drivers/staging/rt2860/rtmp.h | 2 | ||||
-rw-r--r-- | drivers/usb/serial/cypress_m8.h | 2 | ||||
-rw-r--r-- | drivers/usb/serial/io_edgeport.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/kl5kusb105.c | 2 |
17 files changed, 19 insertions, 19 deletions
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index 20ef1bf5e726..703959eba45a 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
@@ -270,7 +270,7 @@ static void uninorth_agp_enable(struct agp_bridge_data *bridge, u32 mode) | |||
270 | 270 | ||
271 | if ((uninorth_rev >= 0x30) && (uninorth_rev <= 0x33)) { | 271 | if ((uninorth_rev >= 0x30) && (uninorth_rev <= 0x33)) { |
272 | /* | 272 | /* |
273 | * We need to to set REQ_DEPTH to 7 for U3 versions 1.0, 2.1, | 273 | * We need to set REQ_DEPTH to 7 for U3 versions 1.0, 2.1, |
274 | * 2.2 and 2.3, Darwin do so. | 274 | * 2.2 and 2.3, Darwin do so. |
275 | */ | 275 | */ |
276 | if ((command >> AGPSTAT_RQ_DEPTH_SHIFT) > 7) | 276 | if ((command >> AGPSTAT_RQ_DEPTH_SHIFT) > 7) |
diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c index b710fab21cb3..a53b848e0f17 100644 --- a/drivers/gpu/drm/mga/mga_state.c +++ b/drivers/gpu/drm/mga/mga_state.c | |||
@@ -239,7 +239,7 @@ static __inline__ void mga_g200_emit_pipe(drm_mga_private_t * dev_priv) | |||
239 | MGA_WR34, 0x00000000, | 239 | MGA_WR34, 0x00000000, |
240 | MGA_WR42, 0x0000ffff, MGA_WR60, 0x0000ffff); | 240 | MGA_WR42, 0x0000ffff, MGA_WR60, 0x0000ffff); |
241 | 241 | ||
242 | /* Padding required to to hardware bug. | 242 | /* Padding required due to hardware bug. |
243 | */ | 243 | */ |
244 | DMA_BLOCK(MGA_DMAPAD, 0xffffffff, | 244 | DMA_BLOCK(MGA_DMAPAD, 0xffffffff, |
245 | MGA_DMAPAD, 0xffffffff, | 245 | MGA_DMAPAD, 0xffffffff, |
@@ -317,7 +317,7 @@ static __inline__ void mga_g400_emit_pipe(drm_mga_private_t * dev_priv) | |||
317 | MGA_WR52, MGA_G400_WR_MAGIC, /* tex1 width */ | 317 | MGA_WR52, MGA_G400_WR_MAGIC, /* tex1 width */ |
318 | MGA_WR60, MGA_G400_WR_MAGIC); /* tex1 height */ | 318 | MGA_WR60, MGA_G400_WR_MAGIC); /* tex1 height */ |
319 | 319 | ||
320 | /* Padding required to to hardware bug */ | 320 | /* Padding required due to hardware bug */ |
321 | DMA_BLOCK(MGA_DMAPAD, 0xffffffff, | 321 | DMA_BLOCK(MGA_DMAPAD, 0xffffffff, |
322 | MGA_DMAPAD, 0xffffffff, | 322 | MGA_DMAPAD, 0xffffffff, |
323 | MGA_DMAPAD, 0xffffffff, | 323 | MGA_DMAPAD, 0xffffffff, |
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index a8d0aee3bc0e..8aaad65c3bb5 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c | |||
@@ -894,7 +894,7 @@ void guest_set_pte(struct lg_cpu *cpu, | |||
894 | * tells us they've changed. When the Guest tries to use the new entry it will | 894 | * tells us they've changed. When the Guest tries to use the new entry it will |
895 | * fault and demand_page() will fix it up. | 895 | * fault and demand_page() will fix it up. |
896 | * | 896 | * |
897 | * So with that in mind here's our code to to update a (top-level) PGD entry: | 897 | * So with that in mind here's our code to update a (top-level) PGD entry: |
898 | */ | 898 | */ |
899 | void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 idx) | 899 | void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 idx) |
900 | { | 900 | { |
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c index 8a5bba16ff32..7f1e5415850b 100644 --- a/drivers/media/video/gspca/m5602/m5602_core.c +++ b/drivers/media/video/gspca/m5602/m5602_core.c | |||
@@ -56,7 +56,7 @@ int m5602_read_bridge(struct sd *sd, const u8 address, u8 *i2c_data) | |||
56 | return (err < 0) ? err : 0; | 56 | return (err < 0) ? err : 0; |
57 | } | 57 | } |
58 | 58 | ||
59 | /* Writes a byte to to the m5602 */ | 59 | /* Writes a byte to the m5602 */ |
60 | int m5602_write_bridge(struct sd *sd, const u8 address, const u8 i2c_data) | 60 | int m5602_write_bridge(struct sd *sd, const u8 address, const u8 i2c_data) |
61 | { | 61 | { |
62 | int err; | 62 | int err; |
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index bc14bb1b0579..88671529c45d 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c | |||
@@ -512,7 +512,7 @@ static void mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat) | |||
512 | } | 512 | } |
513 | 513 | ||
514 | /* For the DMA case the DMA engine handles the data transfer | 514 | /* For the DMA case the DMA engine handles the data transfer |
515 | * automatically. For non DMA we have to to it ourselves. | 515 | * automatically. For non DMA we have to do it ourselves. |
516 | * Don't do it in interrupt context though. | 516 | * Don't do it in interrupt context though. |
517 | */ | 517 | */ |
518 | if (!mxcmci_use_dma(host) && host->data) | 518 | if (!mxcmci_use_dma(host) && host->data) |
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c index d4fb9a3ab4df..1bdf0ee6d0b6 100644 --- a/drivers/mtd/maps/ixp2000.c +++ b/drivers/mtd/maps/ixp2000.c | |||
@@ -184,7 +184,7 @@ static int ixp2000_flash_probe(struct platform_device *dev) | |||
184 | info->map.bankwidth = 1; | 184 | info->map.bankwidth = 1; |
185 | 185 | ||
186 | /* | 186 | /* |
187 | * map_priv_2 is used to store a ptr to to the bank_setup routine | 187 | * map_priv_2 is used to store a ptr to the bank_setup routine |
188 | */ | 188 | */ |
189 | info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup; | 189 | info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup; |
190 | 190 | ||
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index e4d9ef0c965a..9f87c99189a9 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c | |||
@@ -1065,7 +1065,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to, | |||
1065 | } | 1065 | } |
1066 | 1066 | ||
1067 | /* | 1067 | /* |
1068 | * Now we have got to calculate how much data we have to to copy. In | 1068 | * Now we have got to calculate how much data we have to copy. In |
1069 | * case of a static volume it is fairly easy - the VID header contains | 1069 | * case of a static volume it is fairly easy - the VID header contains |
1070 | * the data size. In case of a dynamic volume it is more difficult - we | 1070 | * the data size. In case of a dynamic volume it is more difficult - we |
1071 | * have to read the contents, cut 0xFF bytes from the end and copy only | 1071 | * have to read the contents, cut 0xFF bytes from the end and copy only |
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index 6a5fe9633783..47877942decc 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h | |||
@@ -570,7 +570,7 @@ void ubi_do_get_volume_info(struct ubi_device *ubi, struct ubi_volume *vol, | |||
570 | 570 | ||
571 | /* | 571 | /* |
572 | * ubi_rb_for_each_entry - walk an RB-tree. | 572 | * ubi_rb_for_each_entry - walk an RB-tree. |
573 | * @rb: a pointer to type 'struct rb_node' to to use as a loop counter | 573 | * @rb: a pointer to type 'struct rb_node' to use as a loop counter |
574 | * @pos: a pointer to RB-tree entry type to use as a loop counter | 574 | * @pos: a pointer to RB-tree entry type to use as a loop counter |
575 | * @root: RB-tree's root | 575 | * @root: RB-tree's root |
576 | * @member: the name of the 'struct rb_node' within the RB-tree entry | 576 | * @member: the name of the 'struct rb_node' within the RB-tree entry |
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index cea5cfe23b71..c3fa31c9f2a7 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
@@ -1987,7 +1987,7 @@ void bond_3ad_unbind_slave(struct slave *slave) | |||
1987 | // find new aggregator for the related port(s) | 1987 | // find new aggregator for the related port(s) |
1988 | new_aggregator = __get_first_agg(port); | 1988 | new_aggregator = __get_first_agg(port); |
1989 | for (; new_aggregator; new_aggregator = __get_next_agg(new_aggregator)) { | 1989 | for (; new_aggregator; new_aggregator = __get_next_agg(new_aggregator)) { |
1990 | // if the new aggregator is empty, or it connected to to our port only | 1990 | // if the new aggregator is empty, or it is connected to our port only |
1991 | if (!new_aggregator->lag_ports || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator)) { | 1991 | if (!new_aggregator->lag_ports || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator)) { |
1992 | break; | 1992 | break; |
1993 | } | 1993 | } |
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index cda6b397550d..45ac225a7aaa 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c | |||
@@ -3035,7 +3035,7 @@ s32 e1000_check_for_link(struct e1000_hw *hw) | |||
3035 | /* If TBI compatibility is was previously off, turn it on. For | 3035 | /* If TBI compatibility is was previously off, turn it on. For |
3036 | * compatibility with a TBI link partner, we will store bad | 3036 | * compatibility with a TBI link partner, we will store bad |
3037 | * packets. Some frames have an additional byte on the end and | 3037 | * packets. Some frames have an additional byte on the end and |
3038 | * will look like CRC errors to to the hardware. | 3038 | * will look like CRC errors to the hardware. |
3039 | */ | 3039 | */ |
3040 | if (!hw->tbi_compatibility_on) { | 3040 | if (!hw->tbi_compatibility_on) { |
3041 | hw->tbi_compatibility_on = true; | 3041 | hw->tbi_compatibility_on = true; |
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index 5e110a2328ae..4e79a9800134 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c | |||
@@ -368,7 +368,7 @@ error: | |||
368 | return r; | 368 | return r; |
369 | } | 369 | } |
370 | 370 | ||
371 | /* MAC address: if custom mac addresses are to to be used CR_MAC_ADDR_P1 and | 371 | /* MAC address: if custom mac addresses are to be used CR_MAC_ADDR_P1 and |
372 | * CR_MAC_ADDR_P2 must be overwritten | 372 | * CR_MAC_ADDR_P2 must be overwritten |
373 | */ | 373 | */ |
374 | int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr) | 374 | int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr) |
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index 7dc3d1894b1a..a39addc3a596 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
@@ -718,7 +718,7 @@ megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp, | |||
718 | * megasas_build_ldio - Prepares IOs to logical devices | 718 | * megasas_build_ldio - Prepares IOs to logical devices |
719 | * @instance: Adapter soft state | 719 | * @instance: Adapter soft state |
720 | * @scp: SCSI command | 720 | * @scp: SCSI command |
721 | * @cmd: Command to to be prepared | 721 | * @cmd: Command to be prepared |
722 | * | 722 | * |
723 | * Frames (and accompanying SGLs) for regular SCSI IOs use this function. | 723 | * Frames (and accompanying SGLs) for regular SCSI IOs use this function. |
724 | */ | 724 | */ |
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 40e3cafb3a9c..83c8b5e4fc8b 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
@@ -1422,7 +1422,7 @@ static void qla4xxx_slave_destroy(struct scsi_device *sdev) | |||
1422 | /** | 1422 | /** |
1423 | * qla4xxx_del_from_active_array - returns an active srb | 1423 | * qla4xxx_del_from_active_array - returns an active srb |
1424 | * @ha: Pointer to host adapter structure. | 1424 | * @ha: Pointer to host adapter structure. |
1425 | * @index: index into to the active_array | 1425 | * @index: index into the active_array |
1426 | * | 1426 | * |
1427 | * This routine removes and returns the srb at the specified index | 1427 | * This routine removes and returns the srb at the specified index |
1428 | **/ | 1428 | **/ |
@@ -1500,7 +1500,7 @@ static int qla4xxx_wait_for_hba_online(struct scsi_qla_host *ha) | |||
1500 | 1500 | ||
1501 | /** | 1501 | /** |
1502 | * qla4xxx_eh_wait_for_commands - wait for active cmds to finish. | 1502 | * qla4xxx_eh_wait_for_commands - wait for active cmds to finish. |
1503 | * @ha: pointer to to HBA | 1503 | * @ha: pointer to HBA |
1504 | * @t: target id | 1504 | * @t: target id |
1505 | * @l: lun id | 1505 | * @l: lun id |
1506 | * | 1506 | * |
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h index 3f498f6f3ff6..90fd40f24734 100644 --- a/drivers/staging/rt2860/rtmp.h +++ b/drivers/staging/rt2860/rtmp.h | |||
@@ -2060,7 +2060,7 @@ typedef struct _STA_ADMIN_CONFIG { | |||
2060 | BOOLEAN AdhocBGJoined; // Indicate Adhoc B/G Join. | 2060 | BOOLEAN AdhocBGJoined; // Indicate Adhoc B/G Join. |
2061 | BOOLEAN Adhoc20NJoined; // Indicate Adhoc 20MHz N Join. | 2061 | BOOLEAN Adhoc20NJoined; // Indicate Adhoc 20MHz N Join. |
2062 | #endif | 2062 | #endif |
2063 | // New for WPA, windows want us to to keep association information and | 2063 | // New for WPA, windows want us to keep association information and |
2064 | // Fixed IEs from last association response | 2064 | // Fixed IEs from last association response |
2065 | NDIS_802_11_ASSOCIATION_INFORMATION AssocInfo; | 2065 | NDIS_802_11_ASSOCIATION_INFORMATION AssocInfo; |
2066 | USHORT ReqVarIELen; // Length of next VIE include EID & Length | 2066 | USHORT ReqVarIELen; // Length of next VIE include EID & Length |
diff --git a/drivers/usb/serial/cypress_m8.h b/drivers/usb/serial/cypress_m8.h index e772b01ac3ac..1fd360e04065 100644 --- a/drivers/usb/serial/cypress_m8.h +++ b/drivers/usb/serial/cypress_m8.h | |||
@@ -57,7 +57,7 @@ | |||
57 | #define UART_RI 0x10 /* ring indicator - modem - device to host */ | 57 | #define UART_RI 0x10 /* ring indicator - modem - device to host */ |
58 | #define UART_CD 0x40 /* carrier detect - modem - device to host */ | 58 | #define UART_CD 0x40 /* carrier detect - modem - device to host */ |
59 | #define CYP_ERROR 0x08 /* received from input report - device to host */ | 59 | #define CYP_ERROR 0x08 /* received from input report - device to host */ |
60 | /* Note - the below has nothing to to with the "feature report" reset */ | 60 | /* Note - the below has nothing to do with the "feature report" reset */ |
61 | #define CONTROL_RESET 0x08 /* sent with output report - host to device */ | 61 | #define CONTROL_RESET 0x08 /* sent with output report - host to device */ |
62 | 62 | ||
63 | /* End of RS-232 protocol definitions */ | 63 | /* End of RS-232 protocol definitions */ |
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index dc0f832657e6..b97960ac92f2 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
@@ -2540,7 +2540,7 @@ static int calc_baud_rate_divisor(int baudrate, int *divisor) | |||
2540 | 2540 | ||
2541 | /***************************************************************************** | 2541 | /***************************************************************************** |
2542 | * send_cmd_write_uart_register | 2542 | * send_cmd_write_uart_register |
2543 | * this function builds up a uart register message and sends to to the device. | 2543 | * this function builds up a uart register message and sends to the device. |
2544 | *****************************************************************************/ | 2544 | *****************************************************************************/ |
2545 | static int send_cmd_write_uart_register(struct edgeport_port *edge_port, | 2545 | static int send_cmd_write_uart_register(struct edgeport_port *edge_port, |
2546 | __u8 regNum, __u8 regValue) | 2546 | __u8 regNum, __u8 regValue) |
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c index a61673133d7d..f7373371b137 100644 --- a/drivers/usb/serial/kl5kusb105.c +++ b/drivers/usb/serial/kl5kusb105.c | |||
@@ -38,7 +38,7 @@ | |||
38 | * 0.3a - implemented pools of write URBs | 38 | * 0.3a - implemented pools of write URBs |
39 | * 0.3 - alpha version for public testing | 39 | * 0.3 - alpha version for public testing |
40 | * 0.2 - TIOCMGET works, so autopilot(1) can be used! | 40 | * 0.2 - TIOCMGET works, so autopilot(1) can be used! |
41 | * 0.1 - can be used to to pilot-xfer -p /dev/ttyUSB0 -l | 41 | * 0.1 - can be used to do pilot-xfer -p /dev/ttyUSB0 -l |
42 | * | 42 | * |
43 | * The driver skeleton is mainly based on mct_u232.c and various other | 43 | * The driver skeleton is mainly based on mct_u232.c and various other |
44 | * pieces of code shamelessly copied from the drivers/usb/serial/ directory. | 44 | * pieces of code shamelessly copied from the drivers/usb/serial/ directory. |