more work_struct mess
PATCH 1/1 more work_struct mess
---
sound/oss/dmasound/tas3001c.c +7 -7
@@ -50,6 +50,7 @@ struct tas3001c_data_t {int output_id;int speaker_id;struct tas_drce_t drce_state; +struct work_struct change; };
@@ -667,14 +668,13 @@ tas3001c_update_device_parameters(struct }static void -tas3001c_device_change_handler (void *self) +tas3001c_device_change_handler (struct work_struct *work) { -if (self) -tas3001c_update_device_parameters (self); +struct tas3001c_data_t *self; + self = container_of(work, struct tas3001c_data_t, change); +tas3001c_update_device_parameters (self); } -static struct work_struct device_change; - static int tas3001c_output_device_change( struct tas3001c_data_t *self, int device_id,
@@ -685,7 +685,7 @@ tas3001c_output_device_change( struct ta self->output_id=output_id; self->speaker_id=speaker_id; -schedule_work (&device_change); +schedule_work (&self->change);return 0 ; }
@@ -823,7 +823,7 @@ tas3001c_init(struct i2c_client *client)tas3001c_write_biquad_shadow (self, i, j, &tas3001c_eq_unity); -INIT_WORK (&device_change, tas3001c_device_change_handler, self); +INIT_WORK (&self->change, tas3001c_device_change_handler);return 0 ; }
sound/oss/dmasound/tas3004.c +7 -8
@@ -48,6 +48,7 @@ struct tas3004_data_t {int output_id;int speaker_id;struct tas_drce_t drce_state; +struct work_struct change; };#define MAKE_TIME (sec,usec) (((sec)<<12) + (50000+(usec/10)*(1<<12))/100000)
@@ -914,15 +915,13 @@ tas3004_update_device_parameters(struct }static void -tas3004_device_change_handler (void *self) +tas3004_device_change_handler (struct work_struct *work) { -if (!self)return ; - -tas3004_update_device_parameters ((struct tas3004_data_t *)self); +struct tas3004_data_t *self; + self = container_of(work, struct tas3004_data_t, change); +tas3004_update_device_parameters (self); } -static struct work_struct device_change; - static int tas3004_output_device_change( struct tas3004_data_t *self, int device_id,
@@ -933,7 +932,7 @@ tas3004_output_device_change( struct tas self->output_id=output_id; self->speaker_id=speaker_id; -schedule_work (&device_change); +schedule_work (&self->change);return 0 ; }
@@ -1112,7 +1111,7 @@ tas3004_init(struct i2c_client *client)tas3004_write_register (self,TAS3004_REG_MCR2 , &mcr2,WRITE_SHADOW );tas3004_write_register (self,TAS3004_REG_DRC , drce_init,WRITE_SHADOW ); -INIT_WORK (&device_change, tas3004_device_change_handler, self); +INIT_WORK (&self->change, tas3004_device_change_handler);return 0 ; }
Quoted 12 lines · Al Viro
+++
b/sound/oss/dmasound/tas3001c.csound/oss/dmasound/tas3001c.c +2
-1@@ -823,7 +823,7 @@ tas3001c_init(struct i2c_client *client)tas3001c_write_biquad_shadow (self, i, j, &tas3001c_eq_unity); -INIT_WORK (&device_change, tas3001c_device_change_handler, self); +INIT_WORK (&self->change, tas3001c_device_change_handler); +++ b/sound/oss/dmasound/tas3004.c
sound/oss/dmasound/tas3001c.c tas3004_init(struct i2c_client *client) · line 1114
Quoted 5 lines
sound/oss/dmasound/tas3001c.c +1
-1@@ -1112,7 +1111,7 @@ tas3004_init(struct i2c_client *client)tas3004_write_register (self,TAS3004_REG_MCR2 , &mcr2,WRITE_SHADOW );tas3004_write_register (self,TAS3004_REG_DRC , drce_init,WRITE_SHADOW ); -INIT_WORK (&device_change, tas3004_device_change_handler, self); +INIT_WORK (&self->change, tas3004_device_change_handler);
This is not enough to get it going:
error: 'INIT_WORK' undeclared (first use in this function)
Quoted 3 lines · Olaf Hering
This is not enough to get it going:
error: '
INIT_WORK' undeclared (first use in this function)
.config?
Quoted 6 lines · Al Viro
Quoted 3 lines · Olaf Hering
This is not enough to get it going:
error: '
INIT_WORK' undeclared (first use in this function).config?
Its a gcc bug. It doesnt like the number of arguments for INIT_WORK, then it appearently tries to evaluate INIT_WORK again, or whatever.
sound/oss/dmasound/tas3001c.c:826:64: error: macro "INIT_WORK" passed 3 arguments, but takes just 2 sound/oss/dmasound/tas3001c.c: In function 'tas3001c_init':sound/oss/dmasound/tas3001c.c:826: error: 'INIT_WORK' undeclared (first use in this function)
Your patch will fix it.
Quoted 1 line · Al Viro
Signed-off-by Al Viro <[email protected]>
Ben.
Quoted 1 line · Al Viro
Signed-off-by Al Viro <[email protected]>
---
Please merge, right now, pmac32_defconfig is busted. I'm tempted to mark dmasound_pmac for removal soon too ...
Ben.
Quoted 105 lines
---
sound/oss/dmasound/tas3001c.c +7
-7@@ -50,6 +50,7 @@ struct tas3001c_data_t {int output_id;int speaker_id;struct tas_drce_t drce_state; +struct work_struct change; };@@ -667,14 +668,13 @@ tas3001c_update_device_parameters(struct }static void -tas3001c_device_change_handler (void *self) +tas3001c_device_change_handler (struct work_struct *work) { -if (self) -tas3001c_update_device_parameters (self); +struct tas3001c_data_t *self; + self = container_of(work, struct tas3001c_data_t, change); +tas3001c_update_device_parameters (self); } -static struct work_struct device_change; - static int tas3001c_output_device_change( struct tas3001c_data_t *self, int device_id,@@ -685,7 +685,7 @@ tas3001c_output_device_change( struct ta self->output_id=output_id; self->speaker_id=speaker_id; -schedule_work (&device_change); +schedule_work (&self->change);return 0 ; }@@ -823,7 +823,7 @@ tas3001c_init(struct i2c_client *client)tas3001c_write_biquad_shadow (self, i, j, &tas3001c_eq_unity); -INIT_WORK (&device_change, tas3001c_device_change_handler, self); +INIT_WORK (&self->change, tas3001c_device_change_handler);return 0 ; }sound/oss/dmasound/tas3004.c +7
-9@@ -48,6 +48,7 @@ struct tas3004_data_t {int output_id;int speaker_id;struct tas_drce_t drce_state; +struct work_struct change; };#define MAKE_TIME (sec,usec) (((sec)<<12) + (50000+(usec/10)*(1<<12))/100000)@@ -914,15 +915,13 @@ tas3004_update_device_parameters(struct }static void -tas3004_device_change_handler (void *self) +tas3004_device_change_handler (struct work_struct *work) { -if (!self)return ; - -tas3004_update_device_parameters ((struct tas3004_data_t *)self); +struct tas3004_data_t *self; + self = container_of(work, struct tas3004_data_t, change); +tas3004_update_device_parameters (self); } -static struct work_struct device_change; - static int tas3004_output_device_change( struct tas3004_data_t *self, int device_id,@@ -933,7 +932,7 @@ tas3004_output_device_change( struct tas self->output_id=output_id; self->speaker_id=speaker_id; -schedule_work (&device_change); +schedule_work (&self->change);return 0 ; }@@ -1112,7 +1111,7 @@ tas3004_init(struct i2c_client *client)tas3004_write_register (self,TAS3004_REG_MCR2 , &mcr2,WRITE_SHADOW );tas3004_write_register (self,TAS3004_REG_DRC , drce_init,WRITE_SHADOW ); -INIT_WORK (&device_change, tas3004_device_change_handler, self); +INIT_WORK (&self->change, tas3004_device_change_handler);return 0 ; } -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/