Commit 57753767 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] staging: as102: Make the driver select CONFIG_FW_LOADER 



It doesn't seem to be of much advantage to compile in FW_LOADER
support conditionally, then make the driver always select FW_LOADER
and remove #idefs from the code.

Cc: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarSylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 82aae98d

drivers/staging/media/as102/Kconfig

+1 −0
Original line number Diff line number Diff line 
config DVB_AS102

	tristate "Abilis AS102 DVB receiver"

	depends on DVB_CORE && USB && I2C && INPUT

	select FW_LOADER

	help

	  Choose Y or M here if you have a device containing an AS102

drivers/staging/media/as102/as102_drv.c

+0 −3
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ int as102_dvb_register(struct as102_dev_t *as102_dev) 
	/* init start / stop stream mutex */

	mutex_init(&as102_dev->sem);



#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)

	/*

	 * try to load as102 firmware. If firmware upload failed, we'll be

	 * able to upload it later.
@@ -257,8 +256,6 @@ int as102_dvb_register(struct as102_dev_t *as102_dev) 
	if (fw_upload)

		try_then_request_module(as102_fw_upload(&as102_dev->bus_adap),

				"firmware_class");

#endif



failed:

	LEAVE();

	/* FIXME: free dvb_XXX */

drivers/staging/media/as102/as102_fw.c

+1 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "as102_drv.h"

#include "as102_fw.h"



#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)

char as102_st_fw1[] = "as102_data1_st.hex";

char as102_st_fw2[] = "as102_data2_st.hex";

char as102_dt_fw1[] = "as102_data1_dt.hex";
@@ -182,7 +181,6 @@ int as102_fw_upload(struct as102_bus_adapter_t *bus_adap) 
		fw2 = as102_st_fw2;

	}



#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)

	/* allocate buffer to store firmware upload command and data */

	cmd_buf = kzalloc(MAX_FW_PKT_SIZE, GFP_KERNEL);

	if (cmd_buf == NULL) {
@@ -237,8 +235,7 @@ int as102_fw_upload(struct as102_bus_adapter_t *bus_adap) 
	/* release firmware if needed */

	if (firmware != NULL)

		release_firmware(firmware);

#endif



	LEAVE();

	return errno;

}
 
#endif