Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82279e6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of... 

Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Fix up irq_node() for irq_data changes.
  genirq: Add single IRQ reservation helper
  genirq: Warn if enable_irq is called before irq is set up

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  semaphore: Remove mutex emulation
  staging: Final semaphore cleanup
  jbd2: Convert jbd2_slab_create_sem to mutex
  hpfs: Convert sbi->hpfs_creation_de to mutex

Fix up trivial change/delete conflicts with deleted 'dream' drivers
(drivers/staging/dream/camera/{mt9d112.c,mt9p012_fox.c,mt9t013.c,s5k3e2fx.c})
parents bb8430a2 4600d7c4 4882720b

drivers/staging/ath6kl/os/linux/ar6000_raw_if.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -198,8 +198,8 @@ int ar6000_htc_raw_open(AR_SOFTC_T *ar) 
        

        

    for (streamID = HTC_RAW_STREAM_0; streamID < HTC_RAW_STREAM_NUM_MAX; streamID++) {

    for (streamID = HTC_RAW_STREAM_0; streamID < HTC_RAW_STREAM_NUM_MAX; streamID++) {

        /* Initialize the data structures */

        /* Initialize the data structures */

        init_MUTEX(&arRaw->raw_htc_read_sem[streamID]);

	sema_init(&arRaw->raw_htc_read_sem[streamID], 1);

        init_MUTEX(&arRaw->raw_htc_write_sem[streamID]);

	sema_init(&arRaw->raw_htc_write_sem[streamID], 1);

        init_waitqueue_head(&arRaw->raw_htc_read_queue[streamID]);

        init_waitqueue_head(&arRaw->raw_htc_read_queue[streamID]);

        init_waitqueue_head(&arRaw->raw_htc_write_queue[streamID]);

        init_waitqueue_head(&arRaw->raw_htc_write_queue[streamID]);

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1929,7 +1929,7 @@ dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen) 
		goto fail;

		goto fail;





	net->netdev_ops = NULL;

	net->netdev_ops = NULL;

	init_MUTEX(&dhd->proto_sem);

	sema_init(&dhd->proto_sem, 1);

	/* Initialize other structure content */

	/* Initialize other structure content */

	init_waitqueue_head(&dhd->ioctl_resp_wait);

	init_waitqueue_head(&dhd->ioctl_resp_wait);

	init_waitqueue_head(&dhd->ctrl_wait);

	init_waitqueue_head(&dhd->ctrl_wait);
@@ -1977,7 +1977,7 @@ dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen) 
	dhd->timer.function = dhd_watchdog;

	dhd->timer.function = dhd_watchdog;





	/* Initialize thread based operation and lock */

	/* Initialize thread based operation and lock */

	init_MUTEX(&dhd->sdsem);

	sema_init(&dhd->sdsem, 1);

	if ((dhd_watchdog_prio >= 0) && (dhd_dpc_prio >= 0))

	if ((dhd_watchdog_prio >= 0) && (dhd_dpc_prio >= 0))

		dhd->threads_only = true;

		dhd->threads_only = true;

	else

	else

drivers/staging/brcm80211/sys/wl_mac80211.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -866,7 +866,7 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs, 
	spin_lock_init(&wl->rpcq_lock);

	spin_lock_init(&wl->rpcq_lock);

	spin_lock_init(&wl->txq_lock);

	spin_lock_init(&wl->txq_lock);





	init_MUTEX(&wl->sem);

	sema_init(&wl->sem, 1);

#else

#else

	spin_lock_init(&wl->lock);

	spin_lock_init(&wl->lock);

	spin_lock_init(&wl->isr_lock);

	spin_lock_init(&wl->isr_lock);

drivers/staging/comedi/drivers/dt9812.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -262,7 +262,7 @@ struct dt9812_usb_cmd { 




#define DT9812_NUM_SLOTS	16

#define DT9812_NUM_SLOTS	16





static DECLARE_MUTEX(dt9812_mutex);

static DEFINE_SEMAPHORE(dt9812_mutex);





static const struct usb_device_id dt9812_table[] = {

static const struct usb_device_id dt9812_table[] = {

	{USB_DEVICE(0x0867, 0x9812)},

	{USB_DEVICE(0x0867, 0x9812)},

drivers/staging/comedi/drivers/usbdux.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -315,7 +315,7 @@ struct usbduxsub { 
 */

 */

static struct usbduxsub usbduxsub[NUMUSBDUX];

static struct usbduxsub usbduxsub[NUMUSBDUX];





static DECLARE_MUTEX(start_stop_sem);

static DEFINE_SEMAPHORE(start_stop_sem);





/*

/*

 * Stops the data acquision

 * Stops the data acquision
@@ -2367,7 +2367,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf, 
	dev_dbg(dev, "comedi_: usbdux: "

	dev_dbg(dev, "comedi_: usbdux: "

		"usbduxsub[%d] is ready to connect to comedi.\n", index);

		"usbduxsub[%d] is ready to connect to comedi.\n", index);





	init_MUTEX(&(usbduxsub[index].sem));

	sema_init(&(usbduxsub[index].sem), 1);

	/* save a pointer to the usb device */

	/* save a pointer to the usb device */

	usbduxsub[index].usbdev = udev;

	usbduxsub[index].usbdev = udev;