diff options
| author | Mike Fiore <mfiore@multitech.com> | 2014-02-14 09:59:55 -0600 |
|---|---|---|
| committer | Mike Fiore <mfiore@multitech.com> | 2014-02-14 09:59:55 -0600 |
| commit | 4d38e64ecee05c0de657757aee26a4c2f852dbc4 (patch) | |
| tree | 1bc1e31dbdcf6c90ae1dbf289edb71a5f50598f7 | |
| parent | ffd90552ea0d03ee20d675f6b83f6a73ce730f3e (diff) | |
| download | cdp-io-controller-4d38e64ecee05c0de657757aee26a4c2f852dbc4.tar.gz cdp-io-controller-4d38e64ecee05c0de657757aee26a4c2f852dbc4.tar.bz2 cdp-io-controller-4d38e64ecee05c0de657757aee26a4c2f852dbc4.zip | |
finish support for MTDC-GPIOB daughter card
add #define to handle when eeprom isn't defined in board code
remove duplicate logging when card isn't inserted
| -rw-r--r-- | io-module/Makefile | 1 | ||||
| -rw-r--r-- | io-module/mts_io.c | 11 |
2 files changed, 2 insertions, 10 deletions
diff --git a/io-module/Makefile b/io-module/Makefile index 5d036f4..f95a55e 100644 --- a/io-module/Makefile +++ b/io-module/Makefile @@ -1,4 +1,5 @@ obj-m := mts_io.o +CFLAGS_mts_io.o := ${DAUGHTER_CARD} clean: rm -f *.ko *.o diff --git a/io-module/mts_io.c b/io-module/mts_io.c index c8763c4..5a30e2e 100644 --- a/io-module/mts_io.c +++ b/io-module/mts_io.c @@ -3608,12 +3608,6 @@ static int __init mts_io_init(void) log_info("init: " DRIVER_VERSION); -#ifdef MTOCGD2 - log_info("MTOCGD2 defined"); -#else - log_info("MTOCGD2 undefined"); -#endif - ret = mts_id_eeprom_load(); if (ret) { goto error1; @@ -3627,10 +3621,7 @@ static int __init mts_io_init(void) log_error("error reading daughter card eeprom: %d", ret); log_error("unable to initialize daughter card"); goto error1; - } else if (! has_daughter_card) { - /* boolean flag wasn't set, no card */ - log_info("no daughter card is inserted"); - } else { + } else if (has_daughter_card) { /* no error and we have a daughter card */ if (strstr(dc_eeprom.product_id, PRODUCT_ID_MTDC_GPIOB)) { mts_dc_product_id = MTDC_GPIOB_0_0; |