tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc32: Be less strict in matching %lo part of relocation.
sbus: convert drivers/sbus/char/* to use module_platform_driver()
bbc_i2c: Remove unneeded err variable
sparc: Use kmemdup rather than duplicating its implementation

Linus Torvalds 64b3dcc3 24545cf1

+13 -76
+2 -4
arch/sparc/kernel/ds.c
··· 1181 1181 1182 1182 dp->rcv_buf_len = 4096; 1183 1183 1184 - dp->ds_states = kzalloc(sizeof(ds_states_template), 1185 - GFP_KERNEL); 1184 + dp->ds_states = kmemdup(ds_states_template, 1185 + sizeof(ds_states_template), GFP_KERNEL); 1186 1186 if (!dp->ds_states) 1187 1187 goto out_free_rcv_buf; 1188 1188 1189 - memcpy(dp->ds_states, ds_states_template, 1190 - sizeof(ds_states_template)); 1191 1189 dp->num_ds_states = ARRAY_SIZE(ds_states_template); 1192 1190 1193 1191 for (i = 0; i < dp->num_ds_states; i++)
+1 -3
arch/sparc/kernel/prom_common.c
··· 58 58 void *new_val; 59 59 int err; 60 60 61 - new_val = kmalloc(len, GFP_KERNEL); 61 + new_val = kmemdup(val, len, GFP_KERNEL); 62 62 if (!new_val) 63 63 return -ENOMEM; 64 - 65 - memcpy(new_val, val, len); 66 64 67 65 err = -ENODEV; 68 66
+1 -2
arch/sparc/mm/btfixup.c
··· 302 302 case 'i': /* INT */ 303 303 if ((insn & 0xc1c00000) == 0x01000000) /* %HI */ 304 304 set_addr(addr, q[1], fmangled, (insn & 0xffc00000) | (p[1] >> 10)); 305 - else if ((insn & 0x80002000) == 0x80002000 && 306 - (insn & 0x01800000) != 0x01800000) /* %LO */ 305 + else if ((insn & 0x80002000) == 0x80002000) /* %LO */ 307 306 set_addr(addr, q[1], fmangled, (insn & 0xffffe000) | (p[1] & 0x3ff)); 308 307 else { 309 308 prom_printf(insn_i, p, addr, insn);
+5 -22
drivers/sbus/char/bbc_i2c.c
··· 233 233 int ret = 0; 234 234 235 235 while (len > 0) { 236 - int err = bbc_i2c_writeb(client, *buf, off); 237 - 238 - if (err < 0) { 239 - ret = err; 236 + ret = bbc_i2c_writeb(client, *buf, off); 237 + if (ret < 0) 240 238 break; 241 - } 242 - 243 239 len--; 244 240 buf++; 245 241 off++; ··· 249 253 int ret = 0; 250 254 251 255 while (len > 0) { 252 - int err = bbc_i2c_readb(client, buf, off); 253 - if (err < 0) { 254 - ret = err; 256 + ret = bbc_i2c_readb(client, buf, off); 257 + if (ret < 0) 255 258 break; 256 - } 257 259 len--; 258 260 buf++; 259 261 off++; ··· 416 422 .remove = __devexit_p(bbc_i2c_remove), 417 423 }; 418 424 419 - static int __init bbc_i2c_init(void) 420 - { 421 - return platform_driver_register(&bbc_i2c_driver); 422 - } 423 - 424 - static void __exit bbc_i2c_exit(void) 425 - { 426 - platform_driver_unregister(&bbc_i2c_driver); 427 - } 428 - 429 - module_init(bbc_i2c_init); 430 - module_exit(bbc_i2c_exit); 425 + module_platform_driver(bbc_i2c_driver); 431 426 432 427 MODULE_LICENSE("GPL");
+1 -12
drivers/sbus/char/display7seg.c
··· 275 275 .remove = __devexit_p(d7s_remove), 276 276 }; 277 277 278 - static int __init d7s_init(void) 279 - { 280 - return platform_driver_register(&d7s_driver); 281 - } 282 - 283 - static void __exit d7s_exit(void) 284 - { 285 - platform_driver_unregister(&d7s_driver); 286 - } 287 - 288 - module_init(d7s_init); 289 - module_exit(d7s_exit); 278 + module_platform_driver(d7s_driver);
+1 -11
drivers/sbus/char/envctrl.c
··· 1138 1138 .remove = __devexit_p(envctrl_remove), 1139 1139 }; 1140 1140 1141 - static int __init envctrl_init(void) 1142 - { 1143 - return platform_driver_register(&envctrl_driver); 1144 - } 1141 + module_platform_driver(envctrl_driver); 1145 1142 1146 - static void __exit envctrl_exit(void) 1147 - { 1148 - platform_driver_unregister(&envctrl_driver); 1149 - } 1150 - 1151 - module_init(envctrl_init); 1152 - module_exit(envctrl_exit); 1153 1143 MODULE_LICENSE("GPL");
+1 -11
drivers/sbus/char/flash.c
··· 216 216 .remove = __devexit_p(flash_remove), 217 217 }; 218 218 219 - static int __init flash_init(void) 220 - { 221 - return platform_driver_register(&flash_driver); 222 - } 219 + module_platform_driver(flash_driver); 223 220 224 - static void __exit flash_cleanup(void) 225 - { 226 - platform_driver_unregister(&flash_driver); 227 - } 228 - 229 - module_init(flash_init); 230 - module_exit(flash_cleanup); 231 221 MODULE_LICENSE("GPL");
+1 -11
drivers/sbus/char/uctrl.c
··· 435 435 }; 436 436 437 437 438 - static int __init uctrl_init(void) 439 - { 440 - return platform_driver_register(&uctrl_driver); 441 - } 438 + module_platform_driver(uctrl_driver); 442 439 443 - static void __exit uctrl_exit(void) 444 - { 445 - platform_driver_unregister(&uctrl_driver); 446 - } 447 - 448 - module_init(uctrl_init); 449 - module_exit(uctrl_exit); 450 440 MODULE_LICENSE("GPL");