This patch was created using Coccinelle and the following steps:

   $ cat >take.cocci <<EOF
   @@
   expression t, f;
   constant m;
   @@

   - AN(f);
   - t = *f;
   - *f = NULL;
   - CHECK_OBJ_NOTNULL(t, m);
   + TAKE_OBJ_NOTNULL(t, f, m);
   EOF
   $ spatch --sp-file take.cocci --dir . --in-place