commit c732acd96085347027b11961463a243c568d9aab · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
fdomain_cs: Sort out modules with duplicate description
pcmcia: Whine harder about use of EXCLUSIVE
pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted

Linus Torvalds 17 years ago c732acd9 1b2d3d94

+20 -10

8 changed files

expand all

unified split

drivers

bluetooth

bluecard_cs.c

bt3c_cs.c

btuart_cs.c

dtl1_cs.c

char

pcmcia

synclink_cs.c

parport

parport_cs.c

pcmcia

pcmcia_resource.c

scsi

fdomain.c

+1 -1

drivers/bluetooth/bluecard_cs.c

··· 867 868 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 869 link->io.NumPorts1 = 8; 870 - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; 871 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 872 873 link->irq.Handler = bluecard_interrupt;

··· 867 868 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 869 link->io.NumPorts1 = 8; 870 + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; 871 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 872 873 link->irq.Handler = bluecard_interrupt;

+4 -2

drivers/bluetooth/bt3c_cs.c

··· 343 bt3c_info_t *info = dev_inst; 344 unsigned int iobase; 345 int iir; 346 347 BUG_ON(!info->hdev); 348 ··· 375 376 outb(iir, iobase + CONTROL); 377 } 378 } 379 380 spin_unlock(&(info->lock)); 381 382 - return IRQ_HANDLED; 383 } 384 385 ··· 659 660 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 661 link->io.NumPorts1 = 8; 662 - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; 663 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 664 665 link->irq.Handler = bt3c_interrupt;

··· 343 bt3c_info_t *info = dev_inst; 344 unsigned int iobase; 345 int iir; 346 + irqreturn_t r = IRQ_NONE; 347 348 BUG_ON(!info->hdev); 349 ··· 374 375 outb(iir, iobase + CONTROL); 376 } 377 + r = IRQ_HANDLED; 378 } 379 380 spin_unlock(&(info->lock)); 381 382 + return r; 383 } 384 385 ··· 657 658 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 659 link->io.NumPorts1 = 8; 660 + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; 661 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 662 663 link->irq.Handler = bt3c_interrupt;

+4 -2

drivers/bluetooth/btuart_cs.c

··· 293 unsigned int iobase; 294 int boguscount = 0; 295 int iir, lsr; 296 297 BUG_ON(!info->hdev); 298 ··· 303 304 iir = inb(iobase + UART_IIR) & UART_IIR_ID; 305 while (iir) { 306 307 /* Clear interrupt */ 308 lsr = inb(iobase + UART_LSR); ··· 337 338 spin_unlock(&(info->lock)); 339 340 - return IRQ_HANDLED; 341 } 342 343 ··· 588 589 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 590 link->io.NumPorts1 = 8; 591 - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; 592 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 593 594 link->irq.Handler = btuart_interrupt;

··· 293 unsigned int iobase; 294 int boguscount = 0; 295 int iir, lsr; 296 + irqreturn_t r = IRQ_NONE; 297 298 BUG_ON(!info->hdev); 299 ··· 302 303 iir = inb(iobase + UART_IIR) & UART_IIR_ID; 304 while (iir) { 305 + r = IRQ_HANDLED; 306 307 /* Clear interrupt */ 308 lsr = inb(iobase + UART_LSR); ··· 335 336 spin_unlock(&(info->lock)); 337 338 + return r; 339 } 340 341 ··· 586 587 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 588 link->io.NumPorts1 = 8; 589 + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; 590 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 591 592 link->irq.Handler = btuart_interrupt;

+5 -2

drivers/bluetooth/dtl1_cs.c

··· 297 unsigned char msr; 298 int boguscount = 0; 299 int iir, lsr; 300 301 BUG_ON(!info->hdev); 302 ··· 308 iir = inb(iobase + UART_IIR) & UART_IIR_ID; 309 while (iir) { 310 311 /* Clear interrupt */ 312 lsr = inb(iobase + UART_LSR); 313 ··· 345 info->ri_latch = msr & UART_MSR_RI; 346 clear_bit(XMIT_WAITING, &(info->tx_state)); 347 dtl1_write_wakeup(info); 348 } 349 350 spin_unlock(&(info->lock)); 351 352 - return IRQ_HANDLED; 353 } 354 355 ··· 571 572 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 573 link->io.NumPorts1 = 8; 574 - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; 575 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 576 577 link->irq.Handler = dtl1_interrupt;

··· 297 unsigned char msr; 298 int boguscount = 0; 299 int iir, lsr; 300 + irqreturn_t r = IRQ_NONE; 301 302 BUG_ON(!info->hdev); 303 ··· 307 iir = inb(iobase + UART_IIR) & UART_IIR_ID; 308 while (iir) { 309 310 + r = IRQ_HANDLED; 311 /* Clear interrupt */ 312 lsr = inb(iobase + UART_LSR); 313 ··· 343 info->ri_latch = msr & UART_MSR_RI; 344 clear_bit(XMIT_WAITING, &(info->tx_state)); 345 dtl1_write_wakeup(info); 346 + r = IRQ_HANDLED; 347 } 348 349 spin_unlock(&(info->lock)); 350 351 + return r; 352 } 353 354 ··· 568 569 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 570 link->io.NumPorts1 = 8; 571 + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; 572 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 573 574 link->irq.Handler = dtl1_interrupt;

+1 -1

drivers/char/pcmcia/synclink_cs.c

··· 554 /* Initialize the struct pcmcia_device structure */ 555 556 /* Interrupt setup */ 557 - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; 558 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 559 link->irq.Handler = NULL; 560

··· 554 /* Initialize the struct pcmcia_device structure */ 555 556 /* Interrupt setup */ 557 + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; 558 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 559 link->irq.Handler = NULL; 560

+1 -1

drivers/parport/parport_cs.c

··· 112 113 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 114 link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; 115 - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; 116 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 117 link->conf.Attributes = CONF_ENABLE_IRQ; 118 link->conf.IntType = INT_MEMORY_AND_IO;

··· 112 113 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; 114 link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; 115 + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; 116 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 117 link->conf.Attributes = CONF_ENABLE_IRQ; 118 link->conf.IntType = INT_MEMORY_AND_IO;

+2 -1

drivers/pcmcia/pcmcia_resource.c

··· 693 type = 0; 694 if (s->functions > 1) /* All of this ought to be handled higher up */ 695 type = IRQF_SHARED; 696 - if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) 697 type = IRQF_SHARED; 698 699 #ifdef CONFIG_PCMCIA_PROBE 700

··· 693 type = 0; 694 if (s->functions > 1) /* All of this ought to be handled higher up */ 695 type = IRQF_SHARED; 696 + else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) 697 type = IRQF_SHARED; 698 + else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n"); 699 700 #ifdef CONFIG_PCMCIA_PROBE 701

drivers/scsi/fdomain.c

··· 290 #include <scsi/scsi_ioctl.h> 291 #include "fdomain.h" 292 293 MODULE_AUTHOR("Rickard E. Faith"); 294 MODULE_DESCRIPTION("Future domain SCSI driver"); 295 MODULE_LICENSE("GPL"); 296 297 298 #define VERSION "$Revision: 5.51 $"

··· 290 #include <scsi/scsi_ioctl.h> 291 #include "fdomain.h" 292 293 + #ifndef PCMCIA 294 MODULE_AUTHOR("Rickard E. Faith"); 295 MODULE_DESCRIPTION("Future domain SCSI driver"); 296 MODULE_LICENSE("GPL"); 297 + #endif 298 299 300 #define VERSION "$Revision: 5.51 $"