Merge branch 'topic/tasklet-convert' of... (05680cc0) · Commits · 戴 / test

sound/core/timer.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -816,9 +816,9 @@ static void snd_timer_clear_callbacks(struct snd_timer *timer,
		* timer tasklet
		*
		*/
		static void snd_timer_tasklet(unsigned long arg)
		static void snd_timer_tasklet(struct tasklet_struct *t)
		{
		struct snd_timer timer = (struct snd_timer ) arg;
		struct snd_timer *timer = from_tasklet(timer, t, task_queue);
		unsigned long flags;

		if (timer->card && timer->card->shutdown) {
		@@ -967,8 +967,7 @@ int snd_timer_new(struct snd_card card, char id, struct snd_timer_id *tid,
		INIT_LIST_HEAD(&timer->ack_list_head);
		INIT_LIST_HEAD(&timer->sack_list_head);
		spin_lock_init(&timer->lock);
		tasklet_init(&timer->task_queue, snd_timer_tasklet,
		(unsigned long)timer);
		tasklet_setup(&timer->task_queue, snd_timer_tasklet);
		timer->max_instances = 1000; /* default limit per timer */
		if (card != NULL) {
		timer->module = card->module;

+4 −4

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@
		#define IT_PKT_HEADER_SIZE_CIP 8 // For 2 CIP header.
		#define IT_PKT_HEADER_SIZE_NO_CIP 0 // Nothing.

		static void pcm_period_tasklet(unsigned long data);
		static void pcm_period_tasklet(struct tasklet_struct *t);

		/**
		* amdtp_stream_init - initialize an AMDTP stream structure
		@@ -94,7 +94,7 @@ int amdtp_stream_init(struct amdtp_stream s, struct fw_unit unit,
		s->flags = flags;
		s->context = ERR_PTR(-1);
		mutex_init(&s->mutex);
		tasklet_init(&s->period_tasklet, pcm_period_tasklet, (unsigned long)s);
		tasklet_setup(&s->period_tasklet, pcm_period_tasklet);
		s->packet_index = 0;

		init_waitqueue_head(&s->callback_wait);
		@@ -441,9 +441,9 @@ static void update_pcm_pointers(struct amdtp_stream *s,
		}
		}

		static void pcm_period_tasklet(unsigned long data)
		static void pcm_period_tasklet(struct tasklet_struct *t)
		{
		struct amdtp_stream s = (void )data;
		struct amdtp_stream *s = from_tasklet(s, t, period_tasklet);
		struct snd_pcm_substream *pcm = READ_ONCE(s->pcm);

		if (pcm)

+4 −5

Original line number	Diff line number	Diff line
		@@ -921,10 +921,10 @@ static void snd_card_asihpi_timer_function(struct timer_list *t)
		add_timer(&dpcm->timer);
		}

		static void snd_card_asihpi_int_task(unsigned long data)
		static void snd_card_asihpi_int_task(struct tasklet_struct *t)
		{
		struct hpi_adapter a = (struct hpi_adapter )data;
		struct snd_card_asihpi *asihpi;
		struct snd_card_asihpi *asihpi = from_tasklet(asihpi, t, t);
		struct hpi_adapter *a = asihpi->hpi;

		WARN_ON(!a \|\| !a->snd_card \|\| !a->snd_card->private_data);
		asihpi = (struct snd_card_asihpi *)a->snd_card->private_data;
		@@ -2871,8 +2871,7 @@ static int snd_asihpi_probe(struct pci_dev *pci_dev,
		if (hpi->interrupt_mode) {
		asihpi->pcm_start = snd_card_asihpi_pcm_int_start;
		asihpi->pcm_stop = snd_card_asihpi_pcm_int_stop;
		tasklet_init(&asihpi->t, snd_card_asihpi_int_task,
		(unsigned long)hpi);
		tasklet_setup(&asihpi->t, snd_card_asihpi_int_task);
		hpi->interrupt_callback = snd_card_asihpi_isr;
		} else {
		asihpi->pcm_start = snd_card_asihpi_pcm_timer_start;

+3 −3

Original line number	Diff line number	Diff line
		@@ -1070,9 +1070,9 @@ getmixer(struct cmdif cif, short num, unsigned short rval,
		return 0;
		}

		static void riptide_handleirq(unsigned long dev_id)
		static void riptide_handleirq(struct tasklet_struct *t)
		{
		struct snd_riptide chip = (void )dev_id;
		struct snd_riptide *chip = from_tasklet(chip, t, riptide_tq);
		struct cmdif *cif = chip->cif;
		struct snd_pcm_substream *substream[PLAYBACK_SUBSTREAMS + 1];
		struct snd_pcm_runtime *runtime;
		@@ -1843,7 +1843,7 @@ snd_riptide_create(struct snd_card card, struct pci_dev pci,
		chip->received_irqs = 0;
		chip->handled_irqs = 0;
		chip->cif = NULL;
		tasklet_init(&chip->riptide_tq, riptide_handleirq, (unsigned long)chip);
		tasklet_setup(&chip->riptide_tq, riptide_handleirq);

		if ((chip->res_port =
		request_region(chip->port, 64, "RIPTIDE")) == NULL) {

+3 −3

Original line number	Diff line number	Diff line
		@@ -3791,9 +3791,9 @@ static int snd_hdsp_set_defaults(struct hdsp *hdsp)
		return 0;
		}

		static void hdsp_midi_tasklet(unsigned long arg)
		static void hdsp_midi_tasklet(struct tasklet_struct *t)
		{
		struct hdsp hdsp = (struct hdsp )arg;
		struct hdsp *hdsp = from_tasklet(hdsp, t, midi_tasklet);

		if (hdsp->midi[0].pending)
		snd_hdsp_midi_input_read (&hdsp->midi[0]);
		@@ -5182,7 +5182,7 @@ static int snd_hdsp_create(struct snd_card *card,

		spin_lock_init(&hdsp->lock);

		tasklet_init(&hdsp->midi_tasklet, hdsp_midi_tasklet, (unsigned long)hdsp);
		tasklet_setup(&hdsp->midi_tasklet, hdsp_midi_tasklet);

		pci_read_config_word(hdsp->pci, PCI_CLASS_REVISION, &hdsp->firmware_rev);
		hdsp->firmware_rev &= 0xff;