projects
/
openwrt
/
svn-archive
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
963522c
)
fix compiler warnings
author
Gabor Juhos
<juhosg@openwrt.org>
Sun, 22 Jul 2007 14:19:25 +0000
(14:19 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Sun, 22 Jul 2007 14:19:25 +0000
(14:19 +0000)
SVN-Revision: 8104
target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
patch
|
blob
|
history
target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
patch
|
blob
|
history
target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
patch
|
blob
|
history
diff --git
a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
index 38a4593cee7277cc09126ffa9bee095771048aa5..6251fa47f253938297ecca24c4d1dd16c2af8e62 100644
(file)
--- a/
target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
+++ b/
target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
@@
-272,7
+272,6
@@
find_root(struct mtd_info *mtd, size_t size, struct mtd_partition *part)
int off, blocksize;
u32 i, crc = ~0;
size_t len;
int off, blocksize;
u32 i, crc = ~0;
size_t len;
- struct squashfs_super_block *sb = (struct squashfs_super_block *) buf;
blocksize = mtd->erasesize;
if (blocksize < 0x10000)
blocksize = mtd->erasesize;
if (blocksize < 0x10000)
@@
-450,8
+449,8
@@
int __init init_adm5120_map(void)
#ifdef CONFIG_MTD_MYLOADER_PARTS
if (adm5120_boot_loader == BOOT_LOADER_MYLOADER)
{
#ifdef CONFIG_MTD_MYLOADER_PARTS
if (adm5120_boot_loader == BOOT_LOADER_MYLOADER)
{
- printk(KERN_NOTICE "adm5120 : using MyLoader flash mapping\n");
char *part_type;
char *part_type;
+ printk(KERN_NOTICE "adm5120 : using MyLoader flash mapping\n");
if (parsed_nr_parts == 0) {
ret = parse_myloader_partitions(adm5120_mtd, &parts, 0);
if (parsed_nr_parts == 0) {
ret = parse_myloader_partitions(adm5120_mtd, &parts, 0);
diff --git
a/target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
b/target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
index ee916d78006d14a941f03877bc58451a171fbff4..316f764b8a0d24712e80e82a5ac1ad6af1b3c66d 100644
(file)
--- a/
target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
+++ b/
target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
@@
-51,7
+51,6
@@
int parse_myloader_partitions(struct mtd_info *master,
int num_parts;
int ret, i;
size_t retlen;
int num_parts;
int ret, i;
size_t retlen;
- size_t parts_len;
char *names;
unsigned long offset;
unsigned long blocklen;
char *names;
unsigned long offset;
unsigned long blocklen;
diff --git
a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
index dfc030ea1c0473ff8e4d90c98f9a012ff5a13800..a3186c3841166ba6adc630a7c25ff0b2b703abe8 100644
(file)
--- a/
target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
+++ b/
target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
@@
-40,9
+40,9
@@
static unsigned char vlan_matrix[SW_DEVS] = {
0x41, 0x42, 0x44, 0x48, 0x50, 0x60
};
0x41, 0x42, 0x44, 0x48, 0x50, 0x60
};
-/* default settings - unlimited TX and RX on all ports, default shaper mode */
+/* default settings - unlimited TX and RX on all ports, default shaper mode */
static unsigned char bw_matrix[SW_DEVS] = {
static unsigned char bw_matrix[SW_DEVS] = {
- 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0
};
static int adm5120_nrdevs;
};
static int adm5120_nrdevs;
@@
-225,7
+225,7
@@
static void adm5120_set_bw(char *matrix)
else
adm5120_set_reg(ADM5120_BW_CTL1, val & ~0x8000000);
else
adm5120_set_reg(ADM5120_BW_CTL1, val & ~0x8000000);
- printk(KERN_DEBUG "D: ctl0 0x%
x, ctl1 0x%
x\n",
+ printk(KERN_DEBUG "D: ctl0 0x%
lx, ctl1 0x%l
x\n",
adm5120_get_reg(ADM5120_BW_CTL0),
adm5120_get_reg(ADM5120_BW_CTL1));
}
adm5120_get_reg(ADM5120_BW_CTL0),
adm5120_get_reg(ADM5120_BW_CTL1));
}
@@
-373,17
+373,17
@@
static int adm5120_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
break;
case SIOCGETBW:
err = copy_to_user(rq->ifr_data, bw_matrix, sizeof(bw_matrix));
break;
case SIOCGETBW:
err = copy_to_user(rq->ifr_data, bw_matrix, sizeof(bw_matrix));
- if (err)
- return -EFAULT;
- break;
+ if (err)
+ return -EFAULT;
+ break;
case SIOCSETBW:
case SIOCSETBW:
- if (!capable(CAP_NET_ADMIN))
+ if (!capable(CAP_NET_ADMIN))
return -EPERM;
err = copy_from_user(bw_matrix, rq->ifr_data, sizeof(bw_matrix));
return -EPERM;
err = copy_from_user(bw_matrix, rq->ifr_data, sizeof(bw_matrix));
- if (err)
+ if (err)
return -EFAULT;
adm5120_set_bw(bw_matrix);
return -EFAULT;
adm5120_set_bw(bw_matrix);
- break;
+ break;
default:
return -EOPNOTSUPP;
}
default:
return -EOPNOTSUPP;
}