.. | .. |
---|
200 | 200 | |
---|
201 | 201 | r = kobject_action_type(buf, count, &action, &action_args); |
---|
202 | 202 | if (r) { |
---|
203 | | - msg = "unknown uevent action string\n"; |
---|
| 203 | + msg = "unknown uevent action string"; |
---|
204 | 204 | goto out; |
---|
205 | 205 | } |
---|
206 | 206 | |
---|
.. | .. |
---|
212 | 212 | r = kobject_action_args(action_args, |
---|
213 | 213 | count - (action_args - buf), &env); |
---|
214 | 214 | if (r == -EINVAL) { |
---|
215 | | - msg = "incorrect uevent action arguments\n"; |
---|
| 215 | + msg = "incorrect uevent action arguments"; |
---|
216 | 216 | goto out; |
---|
217 | 217 | } |
---|
218 | 218 | |
---|
.. | .. |
---|
224 | 224 | out: |
---|
225 | 225 | if (r) { |
---|
226 | 226 | devpath = kobject_get_path(kobj, GFP_KERNEL); |
---|
227 | | - printk(KERN_WARNING "synth uevent: %s: %s", |
---|
| 227 | + pr_warn("synth uevent: %s: %s\n", |
---|
228 | 228 | devpath ?: "unknown device", |
---|
229 | 229 | msg ?: "failed to send uevent"); |
---|
230 | 230 | kfree(devpath); |
---|
.. | .. |
---|
240 | 240 | ops = kobj_ns_ops(kobj); |
---|
241 | 241 | if (ops) { |
---|
242 | 242 | const void *init_ns, *ns; |
---|
| 243 | + |
---|
243 | 244 | ns = kobj->ktype->namespace(kobj); |
---|
244 | 245 | init_ns = ops->initial_ns(); |
---|
245 | 246 | return ns != init_ns; |
---|
.. | .. |
---|
391 | 392 | ops = kobj_ns_ops(kobj); |
---|
392 | 393 | if (!ops && kobj->kset) { |
---|
393 | 394 | struct kobject *ksobj = &kobj->kset->kobj; |
---|
| 395 | + |
---|
394 | 396 | if (ksobj->parent != NULL) |
---|
395 | 397 | ops = kobj_ns_ops(ksobj->parent); |
---|
396 | 398 | } |
---|
.. | .. |
---|
518 | 520 | return 0; |
---|
519 | 521 | } |
---|
520 | 522 | |
---|
521 | | - if (IS_ENABLED(CONFIG_ARCH_ROCKCHIP) && |
---|
522 | | - IS_ENABLED(CONFIG_FREEZER) && |
---|
523 | | - IS_ENABLED(CONFIG_ANDROID)) { |
---|
524 | | - /* |
---|
525 | | - * Android healthd try to listen power_supply subsystem uevent, |
---|
526 | | - * but which will block system from suspend on big.LITTLE system |
---|
527 | | - * because thermal_cooling_device_unregister will called when |
---|
528 | | - * cpufreq_exit. So ignore this uevent when suspend. |
---|
529 | | - */ |
---|
530 | | - extern bool pm_freezing; |
---|
531 | | - |
---|
532 | | - if (pm_freezing && !strcmp(subsystem, "thermal")) |
---|
533 | | - return 0; |
---|
534 | | - } |
---|
535 | | - |
---|
536 | 523 | /* environment buffer */ |
---|
537 | 524 | env = kzalloc(sizeof(struct kobj_uevent_env), GFP_KERNEL); |
---|
538 | 525 | if (!env) |
---|
.. | .. |
---|
598 | 585 | |
---|
599 | 586 | mutex_lock(&uevent_sock_mutex); |
---|
600 | 587 | /* we will send an event, so request a new sequence number */ |
---|
601 | | - retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)++uevent_seqnum); |
---|
| 588 | + retval = add_uevent_var(env, "SEQNUM=%llu", ++uevent_seqnum); |
---|
602 | 589 | if (retval) { |
---|
603 | 590 | mutex_unlock(&uevent_sock_mutex); |
---|
604 | 591 | goto exit; |
---|
.. | .. |
---|
782 | 769 | |
---|
783 | 770 | ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT, &cfg); |
---|
784 | 771 | if (!ue_sk->sk) { |
---|
785 | | - printk(KERN_ERR |
---|
786 | | - "kobject_uevent: unable to create netlink socket!\n"); |
---|
| 772 | + pr_err("kobject_uevent: unable to create netlink socket!\n"); |
---|
787 | 773 | kfree(ue_sk); |
---|
788 | 774 | return -ENODEV; |
---|
789 | 775 | } |
---|