Merge "sound: usb: replace %p with %pK" (34166917) · Commits · e / devices / android_kernel_oneplus_sm8150

sound/usb/endpoint.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -357,7 +357,7 @@ static void queue_pending_output_urbs(struct snd_usb_endpoint *ep)
		err = usb_submit_urb(ctx->urb, GFP_ATOMIC);
		if (err < 0)
		usb_audio_err(ep->chip,
		"Unable to submit urb #%d: %d (urb %p)\n",
		"Unable to submit urb #%d: %d (urb %pK)\n",
		ctx->index, err, ctx->urb);
		else
		set_bit(ctx->index, &ep->active_mask);
		@@ -462,7 +462,7 @@ struct snd_usb_endpoint snd_usb_add_endpoint(struct snd_usb_audio chip,
		ep->iface == alts->desc.bInterfaceNumber &&
		ep->altsetting == alts->desc.bAlternateSetting) {
		usb_audio_dbg(ep->chip,
		"Re-using EP %x in iface %d,%d @%p\n",
		"Re-using EP %x in iface %d,%d @%pK\n",
		ep_num, ep->iface, ep->altsetting, ep);
		goto __exit_unlock;
		}

sound/usb/pcm.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ static int start_endpoints(struct snd_usb_substream *subs)
		if (!test_and_set_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags)) {
		struct snd_usb_endpoint *ep = subs->data_endpoint;

		dev_dbg(&subs->dev->dev, "Starting data EP @%p\n", ep);
		dev_dbg(&subs->dev->dev, "Starting data EP @%pK\n", ep);

		ep->data_subs = subs;
		err = snd_usb_endpoint_start(ep);
		@@ -257,7 +257,7 @@ static int start_endpoints(struct snd_usb_substream *subs)
		}
		}

		dev_dbg(&subs->dev->dev, "Starting sync EP @%p\n", ep);
		dev_dbg(&subs->dev->dev, "Starting sync EP @%pK\n", ep);

		ep->sync_slave = subs->data_endpoint;
		err = snd_usb_endpoint_start(ep);
		@@ -645,13 +645,13 @@ static int match_endpoint_audioformats(struct snd_usb_substream *subs,

		if (fp->channels < 1) {
		dev_dbg(&subs->dev->dev,
		"%s: (fmt @%p) no channels\n", __func__, fp);
		"%s: (fmt @%pK) no channels\n", __func__, fp);
		return 0;
		}

		if (!(fp->formats & pcm_format_to_bits(pcm_format))) {
		dev_dbg(&subs->dev->dev,
		"%s: (fmt @%p) no match for format %d\n", __func__,
		"%s: (fmt @%pK) no match for format %d\n", __func__,
		fp, pcm_format);
		return 0;
		}
		@@ -664,7 +664,7 @@ static int match_endpoint_audioformats(struct snd_usb_substream *subs,
		}
		if (!score) {
		dev_dbg(&subs->dev->dev,
		"%s: (fmt @%p) no match for rate %d\n", __func__,
		"%s: (fmt @%pK) no match for rate %d\n", __func__,
		fp, rate);
		return 0;
		}
		@@ -673,7 +673,7 @@ static int match_endpoint_audioformats(struct snd_usb_substream *subs,
		score++;

		dev_dbg(&subs->dev->dev,
		"%s: (fmt @%p) score %d\n", __func__, fp, score);
		"%s: (fmt @%pK) score %d\n", __func__, fp, score);

		return score;
		}