MODULE_PARM_DESC(master_switch_mode,
        "SW_RFKILL_ALL ON should: 0=do nothing (only unlock); 1=restore; 2=unblock all");
 
-static spinlock_t rfkill_op_lock;
+static DEFINE_SPINLOCK(rfkill_op_lock);
 static bool rfkill_op_pending;
 static unsigned long rfkill_sw_pending[BITS_TO_LONGS(NUM_RFKILL_TYPES)];
 static unsigned long rfkill_sw_state[BITS_TO_LONGS(NUM_RFKILL_TYPES)];
                return -EINVAL;
        }
 
-       spin_lock_init(&rfkill_op_lock);
-
        /* Avoid delay at first schedule */
        rfkill_last_scheduled =
                        jiffies - msecs_to_jiffies(RFKILL_OPS_DELAY) - 1;