Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b174527 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

[media] Add and use IS_REACHABLE macro 



In the media drivers, the v4l2 core knows about all submodules
and calls into them from a common function. However this cannot
work if the modules that get called are loadable and the
core is built-in. In that case we get

drivers/built-in.o: In function `set_type':
drivers/media/v4l2-core/tuner-core.c:301: undefined reference to `tea5767_attach'
drivers/media/v4l2-core/tuner-core.c:307: undefined reference to `tea5761_attach'
drivers/media/v4l2-core/tuner-core.c:349: undefined reference to `tda9887_attach'
drivers/media/v4l2-core/tuner-core.c:405: undefined reference to `xc4000_attach'

This was working previously, until the IS_ENABLED() macro was used
to replace the construct like

 #if defined(CONFIG_DVB_CX24110) || (defined(CONFIG_DVB_CX24110_MODULE) && defined(MODULE))

with the difference that the new code no longer checks whether it is being
built as a loadable module itself.

To fix this, this new patch adds an 'IS_REACHABLE' macro, which evaluates
true in exactly the condition that was used previously. The downside
of this is that this trades an obvious link error for a more subtle
runtime failure, but it is clear that the change that introduced the
link error was unintentional and it seems better to revert it for
now. Also, a similar change was originally created by Trent Piepho
and then reverted by teh change to the IS_ENABLED macro.

Ideally Kconfig would be used to avoid the case of a broken dependency,
or the code restructured in a way to turn around the dependency, but either
way would require much larger changes here.

Fixes: 7b34be71 ("[media] use IS_ENABLED() macro")
See-also: c5dec9fb ("V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel")

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent a87a4d34

drivers/media/dvb-frontends/a8293.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ struct a8293_config { 
	u8 i2c_addr;

};



#if IS_ENABLED(CONFIG_DVB_A8293)

#if IS_REACHABLE(CONFIG_DVB_A8293)

extern struct dvb_frontend *a8293_attach(struct dvb_frontend *fe,

	struct i2c_adapter *i2c, const struct a8293_config *cfg);

#else

drivers/media/dvb-frontends/af9013.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ struct af9013_config { 
	u8 gpio[4];

};



#if IS_ENABLED(CONFIG_DVB_AF9013)

#if IS_REACHABLE(CONFIG_DVB_AF9013)

extern struct dvb_frontend *af9013_attach(const struct af9013_config *config,

	struct i2c_adapter *i2c);

#else

drivers/media/dvb-frontends/atbm8830.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct atbm8830_config { 
	u8 agc_hold_loop;

};



#if IS_ENABLED(CONFIG_DVB_ATBM8830)

#if IS_REACHABLE(CONFIG_DVB_ATBM8830)

extern struct dvb_frontend *atbm8830_attach(const struct atbm8830_config *config,

		struct i2c_adapter *i2c);

#else

drivers/media/dvb-frontends/au8522.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct au8522_config { 
	enum au8522_if_freq qam_if;

};



#if IS_ENABLED(CONFIG_DVB_AU8522_DTV)

#if IS_REACHABLE(CONFIG_DVB_AU8522_DTV)

extern struct dvb_frontend *au8522_attach(const struct au8522_config *config,

					  struct i2c_adapter *i2c);

#else

drivers/media/dvb-frontends/bcm3510.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct bcm3510_config 
	int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name);

};



#if IS_ENABLED(CONFIG_DVB_BCM3510)

#if IS_REACHABLE(CONFIG_DVB_BCM3510)

extern struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config,

					   struct i2c_adapter* i2c);

#else