Skip to content

Compile fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CarlPoirier wants to merge 2 commits into
base: aokp
Choose a base branch
from
Open

Compile fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5b7d7b
Compile fixes
CarlPoirier Dec 28, 2017
df5a284
Compile fixes
CarlPoirier Dec 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/arm/mach-msm/bam_dmux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2498,7 +2498,7 @@ static ssize_t show_waketime(struct device *dev,
if (!bamDmux_pkt_dev)
return 0;

return snprintf(buf, sizeof(buf), "%u\n", wakelock_timeout);
return snprintf(buf, sizeof(*buf), "%u\n", wakelock_timeout);
}

static ssize_t store_waketime(struct device *dev,
Expand Down
34 changes: 17 additions & 17 deletions drivers/input/touchscreen/cyttsp4/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@ CFLAGS_cyttsp4_debug.o += $(CY_CFLAG_ADD)
CFLAGS_cyttsp4_devtree.o += $(CY_CFLAG_ADD) -DDEBUG
CFLAGS_cyttsp4_platform.o += $(CY_CFLAG_ADD) -DDEBUG

CFLAGS_cyttsp4_core.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_i2c.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_spi.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_mta.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_mtb.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_mt_a.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_mt_b.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_mt_common.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_btn.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_proximity.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_samsung_sysfs.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_device_access.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_test_device_access_api.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_loader.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_debug.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_devtree.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_platform.o -= $(CY_CFLAG_REMOVE)
CFLAGS_cyttsp4_core.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_core.o))
CFLAGS_cyttsp4_i2c.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_i2c.o))
CFLAGS_cyttsp4_spi.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_spi.o))
CFLAGS_cyttsp4_mta.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_mta.o))
CFLAGS_cyttsp4_mtb.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_mtb.o))
CFLAGS_cyttsp4_mt_a.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_mt_a.o))
CFLAGS_cyttsp4_mt_b.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_mt_b.o))
CFLAGS_cyttsp4_mt_common.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_mt_common.o))
CFLAGS_cyttsp4_btn.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_btn.o))
CFLAGS_cyttsp4_proximity.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_proximity.o))
CFLAGS_cyttsp4_samsung_sysfs.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_samsung_sysfs.o))
CFLAGS_cyttsp4_device_access.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_device_access.o))
CFLAGS_cyttsp4_test_device_access_api.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_test_device_access_api.o))
CFLAGS_cyttsp4_loader.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_loader.o))
CFLAGS_cyttsp4_debug.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_debug.o))
CFLAGS_cyttsp4_devtree.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_devtree.o))
CFLAGS_cyttsp4_platform.o := $(filter-out $(CY_CFLAG_REMOVE),$(CFLAGS_cyttsp4_platform.o))
12 changes: 6 additions & 6 deletions drivers/misc/sec_misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ static struct miscdevice sec_misc_device = {
static ssize_t emmc_checksum_done_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
return snprintf(buf, sizeof(buf), "%d\n", emmc_checksum_done);
return snprintf(buf, sizeof(*buf), "%d\n", emmc_checksum_done);
}

static ssize_t emmc_checksum_done_store(struct device *dev,
Expand All @@ -84,7 +84,7 @@ static DEVICE_ATTR(emmc_checksum_done, S_IRUGO | S_IWUSR ,
static ssize_t emmc_checksum_pass_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
return snprintf(buf, sizeof(buf), "%d\n", emmc_checksum_pass);
return snprintf(buf, sizeof(*buf), "%d\n", emmc_checksum_pass);
}

static ssize_t emmc_checksum_pass_store(struct device *dev,
Expand Down Expand Up @@ -112,7 +112,7 @@ static ssize_t rory_control_show(struct device *dev,

sec_get_param(param_rory_control, &rory_control);

return snprintf(buf, sizeof(buf), "%d\n", rory_control);
return snprintf(buf, sizeof(*buf), "%d\n", rory_control);
}

static ssize_t rory_control_store(struct device *dev,
Expand Down Expand Up @@ -201,7 +201,7 @@ static ssize_t slideCount_show

sec_get_param(param_slideCount, &slideCount);

return snprintf(buf, sizeof(buf), "%d\n", slideCount);
return snprintf(buf, sizeof(*buf), "%d\n", slideCount);
}

static ssize_t slideCount_store
Expand Down Expand Up @@ -235,7 +235,7 @@ static ssize_t drop_caches_show
(struct device *dev, struct device_attribute *attr, char *buf)
{
int ret = 0;
return snprintf(buf, sizeof(buf), "%d\n", ret);
return snprintf(buf, sizeof(*buf), "%d\n", ret);
}

static ssize_t drop_caches_store
Expand Down Expand Up @@ -283,7 +283,7 @@ static ssize_t update_cp_bin_show

sec_get_param(param_update_cp_bin, (void *)&update);

return snprintf(buf, sizeof(buf), "%d\n", update);
return snprintf(buf, sizeof(*buf), "%d\n", update);
}

static ssize_t update_cp_bin_store
Expand Down
4 changes: 2 additions & 2 deletions drivers/misc/sec_param.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static ssize_t movinand_checksum_done_show
pr_err("checksum is not in valuable range.\n");
ret = 1;
}
return snprintf(buf, sizeof(buf), "%u\n", ret);
return snprintf(buf, sizeof(*buf), "%u\n", ret);
}
static DEVICE_ATTR(movinand_checksum_done,
0664, movinand_checksum_done_show, NULL);
Expand All @@ -262,7 +262,7 @@ static ssize_t movinand_checksum_pass_show
pr_err("checksum is not in valuable range.\n");
ret = 1;
}
return snprintf(buf, sizeof(buf), "%u\n", ret);
return snprintf(buf, sizeof(*buf), "%u\n", ret);
}
static DEVICE_ATTR(movinand_checksum_pass,
0664, movinand_checksum_pass_show, NULL);
Expand Down
2 changes: 1 addition & 1 deletion kernel/timeconst.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ (@)
}

@val = @{$canned_values{$hz}};
if (!defined(@val)) {
if (!@val) {
@val = compute_values($hz);
}
output($hz, @val);
Expand Down
2 changes: 1 addition & 1 deletion net/bluetooth/hci_conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16])
memset(&cp, 0, sizeof(cp));

cp.handle = cpu_to_le16(conn->handle);
memcpy(cp.ltk, ltk, sizeof(ltk));
memcpy(cp.ltk, ltk, sizeof(cp.ltk));

hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
}
Expand Down