FIX COMPILATION WARNING

BZ: 15901

blackbay_pr2.c:170: warning: function declaration isn't a prototype
blackbay_pr2.c:96: warning: 'audience_free_resources' defined but not used

Change-Id: Ie9363e06fa9a9e166d481344bb0fadf33b147943
Signed-off-by: Fei Yang <fei.yang@intel.com>
Reviewed-on: http://android.intel.com:8080/33260
Tested-by: Ng, Cheon-woei <cheon-woei.ng@intel.com>
Reviewed-by: Ng, Cheon-woei <cheon-woei.ng@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/arch/x86/platform/mfld/blackbay_pr2.c b/arch/x86/platform/mfld/blackbay_pr2.c
index 5212781..284c076 100644 (file)
--- a/arch/x86/platform/mfld/blackbay_pr2.c
+++ b/arch/x86/platform/mfld/blackbay_pr2.c
@@ -118,6 +118,7 @@ static struct a1026_platform_data mfld_audience_platform_data = {
        .gpio_a1026_wakeup      = A1026_WAKEUP_GPIO,
        .gpio_a1026_reset       = A1026_RESET_GPIO,
        .request_resources      = audience_request_resources,
+       .free_resources         = audience_free_resources,
        .wakeup                 = audience_wake_up,
        .reset                  = audience_reset,
 };
@@ -166,7 +167,7 @@ static struct i2c_board_info pr2_i2c_bus5_devs[] = {
        },
 };
 
-static void register_board_i2c_devs()
+static void register_board_i2c_devs(void)
 {
        i2c_register_board_info(5, pr2_i2c_bus5_devs,
                                ARRAY_SIZE(pr2_i2c_bus5_devs));

diff --git a/drivers/misc/a1026.c b/drivers/misc/a1026.c
index d77e6ae..cdc26be 100644 (file)
--- a/drivers/misc/a1026.c
+++ b/drivers/misc/a1026.c
@@ -21,7 +21,7 @@
 #include <linux/uaccess.h>
 #include <linux/delay.h>
 #include <linux/firmware.h>
-#include <sound/intel_sst.h> */
+#include <sound/intel_sst.h>
 #include <linux/a1026.h>
 #include <linux/i2c.h>
 
@@ -613,8 +613,12 @@ err_exit:
 
 static int a1026_remove(struct i2c_client *client)
 {
+       struct a1026_platform_data *pdata;
+
+       pdata = client->dev.platform_data;
        misc_deregister(&a1026_device);
        mutex_destroy(&es305->mutex);
+       pdata->free_resources(client);
        kfree(i2c_get_clientdata(client));
        i2c_set_clientdata(client, NULL);
        return 0;

diff --git a/include/linux/a1026.h b/include/linux/a1026.h
index 44cd018..59cd302 100644 (file)
--- a/include/linux/a1026.h
+++ b/include/linux/a1026.h
@@ -75,6 +75,7 @@ struct a1026_platform_data {
        uint32_t gpio_a1026_wakeup;
        uint32_t gpio_a1026_reset;
        int (*request_resources) (struct i2c_client *client);
+       void (*free_resources) (struct i2c_client *client);
        void (*reset) (bool state);
        void (*wakeup) (bool state);
        char firmware_name[128];