diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/si.c | 6 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-nuc900.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 4 | ||||
-rw-r--r-- | drivers/mtd/maps/plat-ram.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/s3c2410.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/8390/ax88796.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h | 2 | ||||
-rw-r--r-- | drivers/net/sungem_phy.c | 8 | ||||
-rw-r--r-- | drivers/rtc/rtc-isl1208.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-s3c.c | 2 | ||||
-rw-r--r-- | drivers/s390/block/dasd_devmap.c | 2 | ||||
-rw-r--r-- | drivers/usb/storage/realtek_cr.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/booke_wdt.c | 2 |
15 files changed, 22 insertions, 22 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 14313ad43b76..42509492717e 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -1648,7 +1648,7 @@ static int evergreen_cp_resume(struct radeon_device *rdev) | |||
1648 | ring->wptr = 0; | 1648 | ring->wptr = 0; |
1649 | WREG32(CP_RB_WPTR, ring->wptr); | 1649 | WREG32(CP_RB_WPTR, ring->wptr); |
1650 | 1650 | ||
1651 | /* set the wb address wether it's enabled or not */ | 1651 | /* set the wb address whether it's enabled or not */ |
1652 | WREG32(CP_RB_RPTR_ADDR, | 1652 | WREG32(CP_RB_RPTR_ADDR, |
1653 | ((rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC)); | 1653 | ((rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC)); |
1654 | WREG32(CP_RB_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); | 1654 | WREG32(CP_RB_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); |
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 81e6a568c29d..cda01f808f12 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -1059,7 +1059,7 @@ static int cayman_cp_resume(struct radeon_device *rdev) | |||
1059 | 1059 | ||
1060 | WREG32(CP_DEBUG, (1 << 27)); | 1060 | WREG32(CP_DEBUG, (1 << 27)); |
1061 | 1061 | ||
1062 | /* set the wb address wether it's enabled or not */ | 1062 | /* set the wb address whether it's enabled or not */ |
1063 | WREG32(SCRATCH_ADDR, ((rdev->wb.gpu_addr + RADEON_WB_SCRATCH_OFFSET) >> 8) & 0xFFFFFFFF); | 1063 | WREG32(SCRATCH_ADDR, ((rdev->wb.gpu_addr + RADEON_WB_SCRATCH_OFFSET) >> 8) & 0xFFFFFFFF); |
1064 | WREG32(SCRATCH_UMSK, 0xff); | 1064 | WREG32(SCRATCH_UMSK, 0xff); |
1065 | 1065 | ||
@@ -1076,7 +1076,7 @@ static int cayman_cp_resume(struct radeon_device *rdev) | |||
1076 | #endif | 1076 | #endif |
1077 | WREG32(cp_rb_cntl[i], rb_cntl); | 1077 | WREG32(cp_rb_cntl[i], rb_cntl); |
1078 | 1078 | ||
1079 | /* set the wb address wether it's enabled or not */ | 1079 | /* set the wb address whether it's enabled or not */ |
1080 | addr = rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET; | 1080 | addr = rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET; |
1081 | WREG32(cp_rb_rptr_addr[i], addr & 0xFFFFFFFC); | 1081 | WREG32(cp_rb_rptr_addr[i], addr & 0xFFFFFFFC); |
1082 | WREG32(cp_rb_rptr_addr_hi[i], upper_32_bits(addr) & 0xFF); | 1082 | WREG32(cp_rb_rptr_addr_hi[i], upper_32_bits(addr) & 0xFF); |
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index b0db712060fb..ea4691f79ccd 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
@@ -2007,7 +2007,7 @@ static int si_cp_resume(struct radeon_device *rdev) | |||
2007 | ring->wptr = 0; | 2007 | ring->wptr = 0; |
2008 | WREG32(CP_RB0_WPTR, ring->wptr); | 2008 | WREG32(CP_RB0_WPTR, ring->wptr); |
2009 | 2009 | ||
2010 | /* set the wb address wether it's enabled or not */ | 2010 | /* set the wb address whether it's enabled or not */ |
2011 | WREG32(CP_RB0_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC); | 2011 | WREG32(CP_RB0_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC); |
2012 | WREG32(CP_RB0_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); | 2012 | WREG32(CP_RB0_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); |
2013 | 2013 | ||
@@ -2040,7 +2040,7 @@ static int si_cp_resume(struct radeon_device *rdev) | |||
2040 | ring->wptr = 0; | 2040 | ring->wptr = 0; |
2041 | WREG32(CP_RB1_WPTR, ring->wptr); | 2041 | WREG32(CP_RB1_WPTR, ring->wptr); |
2042 | 2042 | ||
2043 | /* set the wb address wether it's enabled or not */ | 2043 | /* set the wb address whether it's enabled or not */ |
2044 | WREG32(CP_RB1_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFFFFFFFC); | 2044 | WREG32(CP_RB1_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFFFFFFFC); |
2045 | WREG32(CP_RB1_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFF); | 2045 | WREG32(CP_RB1_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFF); |
2046 | 2046 | ||
@@ -2066,7 +2066,7 @@ static int si_cp_resume(struct radeon_device *rdev) | |||
2066 | ring->wptr = 0; | 2066 | ring->wptr = 0; |
2067 | WREG32(CP_RB2_WPTR, ring->wptr); | 2067 | WREG32(CP_RB2_WPTR, ring->wptr); |
2068 | 2068 | ||
2069 | /* set the wb address wether it's enabled or not */ | 2069 | /* set the wb address whether it's enabled or not */ |
2070 | WREG32(CP_RB2_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFFFFFFFC); | 2070 | WREG32(CP_RB2_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFFFFFFFC); |
2071 | WREG32(CP_RB2_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFF); | 2071 | WREG32(CP_RB2_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFF); |
2072 | 2072 | ||
diff --git a/drivers/i2c/busses/i2c-nuc900.c b/drivers/i2c/busses/i2c-nuc900.c index f41502ef3f55..a23b91b0b738 100644 --- a/drivers/i2c/busses/i2c-nuc900.c +++ b/drivers/i2c/busses/i2c-nuc900.c | |||
@@ -304,7 +304,7 @@ retry_write: | |||
304 | 304 | ||
305 | case STATE_READ: | 305 | case STATE_READ: |
306 | /* we have a byte of data in the data register, do | 306 | /* we have a byte of data in the data register, do |
307 | * something with it, and then work out wether we are | 307 | * something with it, and then work out whether we are |
308 | * going to do any more read/write | 308 | * going to do any more read/write |
309 | */ | 309 | */ |
310 | 310 | ||
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 3e0335f1fc60..de9e1fa0aa0e 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -208,7 +208,7 @@ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c, | |||
208 | if (msg->flags & I2C_M_REV_DIR_ADDR) | 208 | if (msg->flags & I2C_M_REV_DIR_ADDR) |
209 | addr ^= 1; | 209 | addr ^= 1; |
210 | 210 | ||
211 | /* todo - check for wether ack wanted or not */ | 211 | /* todo - check for whether ack wanted or not */ |
212 | s3c24xx_i2c_enable_ack(i2c); | 212 | s3c24xx_i2c_enable_ack(i2c); |
213 | 213 | ||
214 | iiccon = readl(i2c->regs + S3C2410_IICCON); | 214 | iiccon = readl(i2c->regs + S3C2410_IICCON); |
@@ -397,7 +397,7 @@ static int i2c_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat) | |||
397 | 397 | ||
398 | case STATE_READ: | 398 | case STATE_READ: |
399 | /* we have a byte of data in the data register, do | 399 | /* we have a byte of data in the data register, do |
400 | * something with it, and then work out wether we are | 400 | * something with it, and then work out whether we are |
401 | * going to do any more read/write | 401 | * going to do any more read/write |
402 | */ | 402 | */ |
403 | 403 | ||
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c index 891558de3ec1..2de66b062f0d 100644 --- a/drivers/mtd/maps/plat-ram.c +++ b/drivers/mtd/maps/plat-ram.c | |||
@@ -219,7 +219,7 @@ static int platram_probe(struct platform_device *pdev) | |||
219 | 219 | ||
220 | platram_setrw(info, PLATRAM_RW); | 220 | platram_setrw(info, PLATRAM_RW); |
221 | 221 | ||
222 | /* check to see if there are any available partitions, or wether | 222 | /* check to see if there are any available partitions, or whether |
223 | * to add this device whole */ | 223 | * to add this device whole */ |
224 | 224 | ||
225 | err = mtd_device_parse_register(info->mtd, pdata->probes, NULL, | 225 | err = mtd_device_parse_register(info->mtd, pdata->probes, NULL, |
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 295e4bedad96..79ded48e7427 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
@@ -879,7 +879,7 @@ static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info, | |||
879 | if (chip->ecc.mode != NAND_ECC_HW) | 879 | if (chip->ecc.mode != NAND_ECC_HW) |
880 | return; | 880 | return; |
881 | 881 | ||
882 | /* change the behaviour depending on wether we are using | 882 | /* change the behaviour depending on whether we are using |
883 | * the large or small page nand device */ | 883 | * the large or small page nand device */ |
884 | 884 | ||
885 | if (chip->page_shift > 10) { | 885 | if (chip->page_shift > 10) { |
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index 203ff9dccadb..846381c31185 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c | |||
@@ -109,7 +109,7 @@ static inline struct ax_device *to_ax_dev(struct net_device *dev) | |||
109 | /* | 109 | /* |
110 | * ax_initial_check | 110 | * ax_initial_check |
111 | * | 111 | * |
112 | * do an initial probe for the card to check wether it exists | 112 | * do an initial probe for the card to check whether it exists |
113 | * and is functional | 113 | * and is functional |
114 | */ | 114 | */ |
115 | static int ax_initial_check(struct net_device *dev) | 115 | static int ax_initial_check(struct net_device *dev) |
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h index 7ec4b864a550..75ec5e7cf50d 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h | |||
@@ -27,7 +27,7 @@ struct mcp_gen_header { | |||
27 | * | 27 | * |
28 | * Fields below this comment are extensions added in later versions | 28 | * Fields below this comment are extensions added in later versions |
29 | * of this struct, drivers should compare the header_length against | 29 | * of this struct, drivers should compare the header_length against |
30 | * offsetof(field) to check wether a given MCP implements them. | 30 | * offsetof(field) to check whether a given MCP implements them. |
31 | * | 31 | * |
32 | * Never remove any field. Keep everything naturally align. | 32 | * Never remove any field. Keep everything naturally align. |
33 | */ | 33 | */ |
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index 58f13adaa549..ae7cd7f3656d 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c | |||
@@ -608,7 +608,7 @@ static int bcm5421_poll_link(struct mii_phy* phy) | |||
608 | if ( mode == BCM54XX_COPPER) | 608 | if ( mode == BCM54XX_COPPER) |
609 | return genmii_poll_link(phy); | 609 | return genmii_poll_link(phy); |
610 | 610 | ||
611 | /* try to find out wether we have a link */ | 611 | /* try to find out whether we have a link */ |
612 | phy_write(phy, MII_NCONFIG, 0x2000); | 612 | phy_write(phy, MII_NCONFIG, 0x2000); |
613 | phy_reg = phy_read(phy, MII_NCONFIG); | 613 | phy_reg = phy_read(phy, MII_NCONFIG); |
614 | 614 | ||
@@ -634,7 +634,7 @@ static int bcm5421_read_link(struct mii_phy* phy) | |||
634 | 634 | ||
635 | phy->speed = SPEED_1000; | 635 | phy->speed = SPEED_1000; |
636 | 636 | ||
637 | /* find out wether we are running half- or full duplex */ | 637 | /* find out whether we are running half- or full duplex */ |
638 | phy_write(phy, MII_NCONFIG, 0x2000); | 638 | phy_write(phy, MII_NCONFIG, 0x2000); |
639 | phy_reg = phy_read(phy, MII_NCONFIG); | 639 | phy_reg = phy_read(phy, MII_NCONFIG); |
640 | 640 | ||
@@ -681,7 +681,7 @@ static int bcm5461_poll_link(struct mii_phy* phy) | |||
681 | if ( mode == BCM54XX_COPPER) | 681 | if ( mode == BCM54XX_COPPER) |
682 | return genmii_poll_link(phy); | 682 | return genmii_poll_link(phy); |
683 | 683 | ||
684 | /* find out wether we have a link */ | 684 | /* find out whether we have a link */ |
685 | phy_write(phy, MII_NCONFIG, 0x7000); | 685 | phy_write(phy, MII_NCONFIG, 0x7000); |
686 | phy_reg = phy_read(phy, MII_NCONFIG); | 686 | phy_reg = phy_read(phy, MII_NCONFIG); |
687 | 687 | ||
@@ -710,7 +710,7 @@ static int bcm5461_read_link(struct mii_phy* phy) | |||
710 | 710 | ||
711 | phy->speed = SPEED_1000; | 711 | phy->speed = SPEED_1000; |
712 | 712 | ||
713 | /* find out wether we are running half- or full duplex */ | 713 | /* find out whether we are running half- or full duplex */ |
714 | phy_write(phy, MII_NCONFIG, 0x7000); | 714 | phy_write(phy, MII_NCONFIG, 0x7000); |
715 | phy_reg = phy_read(phy, MII_NCONFIG); | 715 | phy_reg = phy_read(phy, MII_NCONFIG); |
716 | 716 | ||
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c index 26c81f233606..afb7cfa85ccc 100644 --- a/drivers/rtc/rtc-isl1208.c +++ b/drivers/rtc/rtc-isl1208.c | |||
@@ -118,7 +118,7 @@ isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[], | |||
118 | return ret; | 118 | return ret; |
119 | } | 119 | } |
120 | 120 | ||
121 | /* simple check to see wether we have a isl1208 */ | 121 | /* simple check to see whether we have a isl1208 */ |
122 | static int | 122 | static int |
123 | isl1208_i2c_validate_client(struct i2c_client *client) | 123 | isl1208_i2c_validate_client(struct i2c_client *client) |
124 | { | 124 | { |
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 77823d21d314..a7a2a998fa91 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
@@ -186,7 +186,7 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm) | |||
186 | rtc_tm->tm_year = readb(base + S3C2410_RTCYEAR); | 186 | rtc_tm->tm_year = readb(base + S3C2410_RTCYEAR); |
187 | rtc_tm->tm_sec = readb(base + S3C2410_RTCSEC); | 187 | rtc_tm->tm_sec = readb(base + S3C2410_RTCSEC); |
188 | 188 | ||
189 | /* the only way to work out wether the system was mid-update | 189 | /* the only way to work out whether the system was mid-update |
190 | * when we read it is to check the second counter, and if it | 190 | * when we read it is to check the second counter, and if it |
191 | * is zero, then we re-try the entire read | 191 | * is zero, then we re-try the entire read |
192 | */ | 192 | */ |
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index b2b8c18eeced..20cfd028edcf 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c | |||
@@ -1344,7 +1344,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature) | |||
1344 | 1344 | ||
1345 | /* | 1345 | /* |
1346 | * Set / reset given feature. | 1346 | * Set / reset given feature. |
1347 | * Flag indicates wether to set (!=0) or the reset (=0) the feature. | 1347 | * Flag indicates whether to set (!=0) or the reset (=0) the feature. |
1348 | */ | 1348 | */ |
1349 | int | 1349 | int |
1350 | dasd_set_feature(struct ccw_device *cdev, int feature, int flag) | 1350 | dasd_set_feature(struct ccw_device *cdev, int feature, int flag) |
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c index d36446dd7ae8..73c93cf364c8 100644 --- a/drivers/usb/storage/realtek_cr.c +++ b/drivers/usb/storage/realtek_cr.c | |||
@@ -883,7 +883,7 @@ static void rts51x_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) | |||
883 | } else { | 883 | } else { |
884 | US_DEBUGP("%s: NOT working scsi, not SS\n", __func__); | 884 | US_DEBUGP("%s: NOT working scsi, not SS\n", __func__); |
885 | chip->proto_handler_backup(srb, us); | 885 | chip->proto_handler_backup(srb, us); |
886 | /* Check wether card is plugged in */ | 886 | /* Check whether card is plugged in */ |
887 | if (srb->cmnd[0] == TEST_UNIT_READY) { | 887 | if (srb->cmnd[0] == TEST_UNIT_READY) { |
888 | if (srb->result == SAM_STAT_GOOD) { | 888 | if (srb->result == SAM_STAT_GOOD) { |
889 | SET_LUN_READY(chip, srb->device->lun); | 889 | SET_LUN_READY(chip, srb->device->lun); |
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 5b06d31ab6a9..c0bc92d8e438 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c | |||
@@ -212,7 +212,7 @@ static long booke_wdt_ioctl(struct file *file, | |||
212 | return 0; | 212 | return 0; |
213 | } | 213 | } |
214 | 214 | ||
215 | /* wdt_is_active stores wether or not the /dev/watchdog device is opened */ | 215 | /* wdt_is_active stores whether or not the /dev/watchdog device is opened */ |
216 | static unsigned long wdt_is_active; | 216 | static unsigned long wdt_is_active; |
217 | 217 | ||
218 | static int booke_wdt_open(struct inode *inode, struct file *file) | 218 | static int booke_wdt_open(struct inode *inode, struct file *file) |