Skip to contentSkip to conversation

sound/usb/usbaudio.c: remove unneeded casting

PATCH In review John Daiker 2 participants 2 messages Dec 21, 2006 – Dec 22, 2006 Kernel janitors

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sound/usb/usbaudio.c: remove unneeded casting

From: John Daiker <[email protected]>

Went rummaging through usbaudio.c and found some castings that aren't needed as far as I can see. Part of the KernelJanitors TODO list.

--- linux-2.6.orig/sound/usb/usbaudio.c 2006-12-21 13:19:19.000000000
-0800
+++ linux-2.6/sound/usb/usbaudio.c 2006-12-21 13:23:06.000000000 -0800
@@ -253,7 +253,7 @@
struct urb *urb)

 {
     unsigned char *cp = urb->transfer_buffer;

- struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+ struct snd_urb_ctx *ctx = urb->context;

     urb->dev = ctx->subs->dev; /* we need to set this at each time */
     urb->iso_frame_desc[0].length = 3;
@@ -275,7 +275,7 @@
                        struct urb *urb)
 {
     unsigned char *cp = urb->transfer_buffer;

- struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+ struct snd_urb_ctx *ctx = urb->context;

     urb->dev = ctx->subs->dev; /* we need to set this at each time */
     urb->iso_frame_desc[0].length = 4;
@@ -313,7 +313,7 @@
                    struct urb *urb)
 {
     int i, offs;

- struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+ struct snd_urb_ctx *ctx = urb->context;

     offs = 0;
     urb->dev = ctx->subs->dev; /* we need to set this at each time */

@@ -402,7 +402,7 @@
struct snd_pcm_runtime *runtime, struct urb *urb)
{
- struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+ struct snd_urb_ctx *ctx = urb->context;

     urb->dev = ctx->subs->dev; /* we need to set this at each time */
     urb->iso_frame_desc[0].length = 3;

@@ -420,7 +420,7 @@
struct snd_pcm_runtime *runtime, struct urb *urb)
{
- struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+ struct snd_urb_ctx *ctx = urb->context;

     urb->dev = ctx->subs->dev; /* we need to set this at each time */
     urb->iso_frame_desc[0].length = 4;
@@ -537,7 +537,7 @@
     unsigned int counts;
     unsigned long flags;
     int period_elapsed = 0;

- struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+ struct snd_urb_ctx *ctx = urb->context;

     stride = runtime->frame_bits >> 3;

@@ -655,7 +655,7 @@
*/
static void snd_complete_urb(struct urb *urb)
{
- struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;

+    struct snd_urb_ctx *ctx = urb->context;
     struct snd_usb_substream *subs = ctx->subs;
     struct snd_pcm_substream *substream = ctx->subs->pcm_substream;
     int err = 0;

@@ -678,7 +678,7 @@
*/
static void snd_complete_sync_urb(struct urb *urb) {
- struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;

+    struct snd_urb_ctx *ctx = urb->context;
     struct snd_usb_substream *subs = ctx->subs;
     struct snd_pcm_substream *substream = ctx->subs->pcm_substream;
     int err = 0;

@@ -1408,7 +1408,7 @@
static int snd_usb_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{
- struct snd_usb_substream *subs = (struct snd_usb_substream
*)substream->runtime->private_data;

+    struct snd_usb_substream *subs = substream->runtime->private_data;
     struct audioformat *fmt;
     unsigned int channels, rate, format;
     int ret, changed;

@@ -1464,7 +1464,7 @@
*/
static int snd_usb_hw_free(struct snd_pcm_substream *substream) {
- struct snd_usb_substream *subs = (struct snd_usb_substream
*)substream->runtime->private_data;
+ struct snd_usb_substream *subs = substream->runtime->private_data;

     subs->cur_audiofmt = NULL;
     subs->cur_rate = 0;

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw

At Thu, 21 Dec 2006 14:31:34 -0800,

Quoted 7 lines · John Daiker

From: John Daiker <[email protected]>

Went rummaging through usbaudio.c and found some castings that aren't needed as far as I can see. Part of the KernelJanitors TODO list.

The embedded patch is broken due to your MUA.
Could you fix it or use attachments?

thanks,

Takashi

Quoted 95 lines

--- linux-2.6.orig/sound/usb/usbaudio.c 2006-12-21 13:19:19.000000000
-0800
+++ linux-2.6/sound/usb/usbaudio.c 2006-12-21 13:23:06.000000000 -0800

(quoted diff) +9 -9
@@ -253,7 +253,7 @@
                     struct urb *urb)
 {
     unsigned char *cp = urb->transfer_buffer;
-    struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+    struct snd_urb_ctx *ctx = urb->context;
 
     urb->dev = ctx->subs->dev; /* we need to set this at each time */
     urb->iso_frame_desc[0].length = 3;
@@ -275,7 +275,7 @@
                        struct urb *urb)
 {
     unsigned char *cp = urb->transfer_buffer;
-    struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+    struct snd_urb_ctx *ctx = urb->context;
 
     urb->dev = ctx->subs->dev; /* we need to set this at each time */
     urb->iso_frame_desc[0].length = 4;
@@ -313,7 +313,7 @@
                    struct urb *urb)
 {
     int i, offs;
-    struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+    struct snd_urb_ctx *ctx = urb->context;
 
     offs = 0;
     urb->dev = ctx->subs->dev; /* we need to set this at each time */
@@ -402,7 +402,7 @@
                      struct snd_pcm_runtime *runtime,
                      struct urb *urb)
 {
-    struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+    struct snd_urb_ctx *ctx = urb->context;
 
     urb->dev = ctx->subs->dev; /* we need to set this at each time */
     urb->iso_frame_desc[0].length = 3;
@@ -420,7 +420,7 @@
                     struct snd_pcm_runtime *runtime,
                     struct urb *urb)
 {
-    struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+    struct snd_urb_ctx *ctx = urb->context;
 
     urb->dev = ctx->subs->dev; /* we need to set this at each time */
     urb->iso_frame_desc[0].length = 4;
@@ -537,7 +537,7 @@
     unsigned int counts;
     unsigned long flags;
     int period_elapsed = 0;
-    struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+    struct snd_urb_ctx *ctx = urb->context;
 
     stride = runtime->frame_bits >> 3;
 
@@ -655,7 +655,7 @@
  */
 static void snd_complete_urb(struct urb *urb)
 {
-    struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+    struct snd_urb_ctx *ctx = urb->context;
     struct snd_usb_substream *subs = ctx->subs;
     struct snd_pcm_substream *substream = ctx->subs->pcm_substream;
     int err = 0;
@@ -678,7 +678,7 @@
  */
 static void snd_complete_sync_urb(struct urb *urb)
 {
-    struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
+    struct snd_urb_ctx *ctx = urb->context;
     struct snd_usb_substream *subs = ctx->subs;
     struct snd_pcm_substream *substream = ctx->subs->pcm_substream;
     int err = 0;
@@ -1408,7 +1408,7 @@
 static int snd_usb_hw_params(struct snd_pcm_substream *substream,
                  struct snd_pcm_hw_params *hw_params)
 {
-    struct snd_usb_substream *subs = (struct snd_usb_substream 
 *)substream->runtime->private_data;
+    struct snd_usb_substream *subs = substream->runtime->private_data;
     struct audioformat *fmt;
     unsigned int channels, rate, format;
     int ret, changed;
(quoted diff) +1 -1
@@ -1464,7 +1464,7 @@
  */
 static int snd_usb_hw_free(struct snd_pcm_substream *substream)
 {
-    struct snd_usb_substream *subs = (struct snd_usb_substream 
 *)substream->runtime->private_data;
+    struct snd_usb_substream *subs = substream->runtime->private_data;
 
     subs->cur_audiofmt = NULL;
Quoted 2 lines
     subs->cur_rate = 0;

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors