Skip to contentSkip to conversation

Staging: as102: pass device to dev_err()

PATCH In review Dan Carpenter 2 participants 2 messages Nov 16, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: as102: pass device to dev_err()

We'd oops if we hit this dev_err() and also gcc complains:

drivers/staging/media/as102/as102_drv.c: In function ‘as102_dvb_register’:
drivers/staging/media/as102/as102_drv.c:223:3:
warning: passing argument 1 of ‘dev_err’ from incompatible pointer type [enabled by default]

drivers/staging/media/as102/as102_drv.c +1 -1
index b8adfd2..beacb2c 100644
@@ -220,7 +220,7 @@ int as102_dvb_register(struct as102_dev_t *as102_dev)
 
 	ret = dvb_dmx_init(&as102_dev->dvb_dmx);
 	if (ret < 0) {
-		dev_err("%s: dvb_dmx_init() failed: %d\n", __func__, ret);
+		dev_err(dev, "%s: dvb_dmx_init() failed: %d\n", __func__, ret);
 		goto edmxinit;
 	}
 
#1 lore raw

Hi,

Quoted 13 lines · Dan Carpenter

We'd oops if we hit this dev_err() and also gcc complains:

drivers/staging/media/as102/as102_drv.c: In function ‘as102_dvb_register’:
drivers/staging/media/as102/as102_drv.c:223:3:
warning: passing argument 1 of ‘dev_err’ from incompatible pointer type [enabled by default]

drivers/staging/media/as102/as102_drv.c +0 -0
index b8adfd2..beacb2c 100644

drivers/staging/media/as102/as102_drv.c int as102_dvb_register(struct as102_dev_t *as102_dev) · line 225

Quoted 7 lines
drivers/staging/media/as102/as102_drv.c +1 -1
@@ -220,7 +220,7 @@ int as102_dvb_register(struct as102_dev_t *as102_dev)
 
  	ret = dvb_dmx_init(&as102_dev->dvb_dmx);
  	if (ret<  0) {
-		dev_err("%s: dvb_dmx_init() failed: %d\n", __func__, ret);
+		dev_err(dev, "%s: dvb_dmx_init() failed: %d\n", __func__, ret);
  		goto edmxinit;
  	}

Thanks for the patch. However I have addressed the issue already and similar patch is sitting in the patchwork system, waiting for merging. Please see
http://patchwork.linuxtv.org/patch/8355/

Signature · 2 lines
Regards,
Sylwester