From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 19:13:00 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
X-Git-Tag: v2.6.37-rc1~60
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=f063a0c0c995d010960efcc1b2ed14b99674f25c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits)
  Staging: brcm80211: fix usage of roundup in structures
  Staging: bcm: fix up network device reference counting
  Staging: keucr: fix up US_ macro change
  staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
  staging: brcm80211: Remove unnecessary header files.
  staging: brcm80211: Remove unnecessary includes from bcmutils.c
  staging: brcm80211: Removed unnecessary pktsetprio() function.
  Staging: brcm80211: remove typedefs.h
  Staging: brcm80211: remove uintptr typedef usage
  Staging: hv: remove struct vmbus_channel_interface
  Staging: hv: remove Open from struct vmbus_channel_interface
  Staging: hv: storvsc: call vmbus_open directly
  Staging: hv: netvsc: call vmbus_open directly
  Staging: hv: channel: export vmbus_open to modules
  Staging: hv: remove Close from struct vmbus_channel_interface
  Staging: hv: netvsc: call vmbus_close directly
  Staging: hv: storvsc: call vmbus_close directly
  Staging: hv: channel: export vmbus_close to modules
  Staging: hv: remove SendPacket from struct vmbus_channel_interface
  Staging: hv: storvsc: call vmbus_sendpacket directly
  ...

Fix up conflicts in
	drivers/staging/cx25821/cx25821-audio-upstream.c
	drivers/staging/cx25821/cx25821-audio.h
due to warring whitespace cleanups (neither of which were all that great)
---

f063a0c0c995d010960efcc1b2ed14b99674f25c
diff --cc drivers/staging/cx25821/cx25821-audio-upstream.c
index 6f3200666c9,27087dbe5b7..1607b0d86e6
--- a/drivers/staging/cx25821/cx25821-audio-upstream.c
+++ b/drivers/staging/cx25821/cx25821-audio-upstream.c
@@@ -39,9 -39,8 +39,8 @@@ MODULE_DESCRIPTION("v4l2 driver module 
  MODULE_AUTHOR("Hiep Huynh <hiep.huynh@conexant.com>");
  MODULE_LICENSE("GPL");
  
--static int _intr_msk =
- 	FLD_AUD_SRC_RISCI1 | FLD_AUD_SRC_OF | FLD_AUD_SRC_SYNC |
- 	FLD_AUD_SRC_OPC_ERR;
 -FLD_AUD_SRC_RISCI1 | FLD_AUD_SRC_OF | FLD_AUD_SRC_SYNC | FLD_AUD_SRC_OPC_ERR;
++static int _intr_msk = FLD_AUD_SRC_RISCI1 | FLD_AUD_SRC_OF |
++			FLD_AUD_SRC_SYNC | FLD_AUD_SRC_OPC_ERR;
  
  int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev,
  					      struct sram_channel *ch,
@@@ -608,8 -607,8 +607,7 @@@ static irqreturn_t cx25821_upstream_irq
  	if (!dev)
  		return -1;
  
--	sram_ch = dev->channels[dev->_audio_upstream_channel_select].
- 				       sram_channels;
 -					sram_channels;
++	sram_ch = dev->channels[dev->_audio_upstream_channel_select].sram_channels;
  
  	msk_stat = cx_read(sram_ch->int_mstat);
  	audio_status = cx_read(sram_ch->int_stat);
diff --cc drivers/staging/tm6000/tm6000-alsa.c
index e379e3ec444,6c09ef3c71e..184cc505ed8
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@@ -464,10 -411,9 +464,10 @@@ int tm6000_audio_init(struct tm6000_cor
  
  	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_tm6000_pcm_ops);
  
 +	INIT_WORK(&dev->wq_trigger, audio_trigger);
  	rc = snd_card_register(card);
  	if (rc < 0)
- 		goto error;
+ 		goto error_chip;
  
  	dprintk(1,"Registered audio driver for %s\n", card->longname);
  
diff --cc drivers/staging/tm6000/tm6000-core.c
index df3f187959b,80f2bf08450..40a0206e243
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@@ -675,13 -702,13 +675,11 @@@ void tm6000_unregister_extension(struc
  	struct tm6000_core *dev = NULL;
  
  	mutex_lock(&tm6000_devlist_mutex);
- 	list_for_each_entry(dev, &tm6000_devlist, devlist) {
- 		if (dev)
- 			ops->fini(dev);
- 	}
+ 	list_for_each_entry(dev, &tm6000_devlist, devlist)
+ 		ops->fini(dev);
  
 -	mutex_lock(&tm6000_extension_devlist_lock);
  	printk(KERN_INFO "tm6000: Remove (%s) extension\n", ops->name);
  	list_del(&ops->next);
 -	mutex_unlock(&tm6000_extension_devlist_lock);
  	mutex_unlock(&tm6000_devlist_mutex);
  }
  EXPORT_SYMBOL(tm6000_unregister_extension);