tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

gpio bug fixes for v3.3

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
gpio: tps65910: Use correct offset for gpio initialization
gpio/it8761e: Restrict it8761e gpio driver to x86.
gpio-ml-ioh: cleanup __iomem annotation usage
gpio-ml-ioh: cleanup NULL pointer checking
gpio-pch: cleanup __iomem annotation usage
gpio-pch: cleanup NULL pointer checking

Linus Torvalds 99d1edc5 e19c29e8

+8 -7
+1
drivers/gpio/Kconfig
··· 87 87 88 88 config GPIO_IT8761E 89 89 tristate "IT8761E GPIO support" 90 + depends on X86 # unconditional access to IO space. 90 91 help 91 92 Say yes here to support GPIO functionality of IT8761E super I/O chip. 92 93
+4 -4
drivers/gpio/gpio-ml-ioh.c
··· 248 248 static int ioh_irq_type(struct irq_data *d, unsigned int type) 249 249 { 250 250 u32 im; 251 - u32 *im_reg; 251 + void __iomem *im_reg; 252 252 u32 ien; 253 253 u32 im_pos; 254 254 int ch; ··· 412 412 int i, j; 413 413 struct ioh_gpio *chip; 414 414 void __iomem *base; 415 - void __iomem *chip_save; 415 + void *chip_save; 416 416 int irq_base; 417 417 418 418 ret = pci_enable_device(pdev); ··· 428 428 } 429 429 430 430 base = pci_iomap(pdev, 1, 0); 431 - if (base == 0) { 431 + if (!base) { 432 432 dev_err(&pdev->dev, "%s : pci_iomap failed", __func__); 433 433 ret = -ENOMEM; 434 434 goto err_iomap; ··· 521 521 int err; 522 522 int i; 523 523 struct ioh_gpio *chip = pci_get_drvdata(pdev); 524 - void __iomem *chip_save; 524 + void *chip_save; 525 525 526 526 chip_save = chip; 527 527
+2 -2
drivers/gpio/gpio-pch.c
··· 231 231 static int pch_irq_type(struct irq_data *d, unsigned int type) 232 232 { 233 233 u32 im; 234 - u32 *im_reg; 234 + u32 __iomem *im_reg; 235 235 u32 ien; 236 236 u32 im_pos; 237 237 int ch; ··· 376 376 } 377 377 378 378 chip->base = pci_iomap(pdev, 1, 0); 379 - if (chip->base == 0) { 379 + if (!chip->base) { 380 380 dev_err(&pdev->dev, "%s : pci_iomap FAILED", __func__); 381 381 ret = -ENOMEM; 382 382 goto err_iomap;
+1 -1
drivers/gpio/gpio-tps65910.c
··· 52 52 struct tps65910 *tps65910 = container_of(gc, struct tps65910, gpio); 53 53 54 54 /* Set the initial value */ 55 - tps65910_gpio_set(gc, 0, value); 55 + tps65910_gpio_set(gc, offset, value); 56 56 57 57 return tps65910_set_bits(tps65910, TPS65910_GPIO0 + offset, 58 58 GPIO_CFG_MASK);